Merging from trunk.

I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878

674 files changed, 10064 insertions, 117750 deletions

diff --git a/maintainers/docs/update-upstream-data.txt b/maintainers/docs/update-upstream-data.txt
index adeb410d6c4..2abce3b4055 100644
--- a/maintainers/docs/update-upstream-data.txt
+++ b/maintainers/docs/update-upstream-data.txt
@@ -12,4 +12,3 @@ src-for-default.nix will contain advertisedUrl (raw URL chosen on the site; its
 
 nixpkgs/pkgs/build-support/upstream-updater directory contains some scripts. The worker script is called update-upstream-data.sh. This script requires main expression name (e.g. default.nix). It can optionally accpet a second parameter, URL which will be used instead of getting one by parsing the downloadPage (version extraction, mirror URL creation etc. will still be run). After running the script, check src-for-default.nix (or replace default.nix with expression name, if there are seceral expressions in the directory) for new version information.
 
-
diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate
index 741ce7e63ee..dbb3f0d528e 100755
--- a/maintainers/scripts/gnu/gnupdate
+++ b/maintainers/scripts/gnu/gnupdate
@@ -1,4 +1,829 @@
 #!/bin/sh
+# This is actually -*- mode: scheme; coding: utf-8; -*- text.
+main='(module-ref (resolve-module '\''(gnupdate)) '\'gnupdate')'
+exec ${GUILE-guile} -L "$PWD" -l "$0"    \
+         -c "(apply $main (command-line))" "$@"
+!#
+;;; GNUpdate -- Update GNU packages in Nixpkgs.
+;;; Copyright (C) 2010  Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
 
-exec "${GUILE:-guile}" $GUILE_FLAGS -L . -l gnupdate.scm \
-  -e '(apply main (cdr (command-line)))' -- "$@"
+(cond-expand (guile-2 #t)
+             (else (error "GNU Guile 2.0 is required")))
+
+(define-module (gnupdate)
+  #:use-module (sxml ssax)
+  #:use-module (ice-9 popen)
+  #:use-module (ice-9 match)
+  #:use-module (ice-9 rdelim)
+  #:use-module (ice-9 regex)
+  #:use-module (ice-9 vlist)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-9)
+  #:use-module (srfi srfi-11)
+  #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-37)
+  #:use-module (system foreign)
+  #:use-module (rnrs bytevectors)
+  #:export (gnupdate))
+
+
+;;;
+;;; SNix.
+;;;
+
+(define-record-type <location>
+  (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             (snix 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 (xml-element->snix elem attributes body derivations)
+  ;; Return an SNix element corresponding to XML element ELEM.
+
+  (define (loc)
+    (->loc (assq-ref attributes 'line)
+           (assq-ref attributes 'column)
+           (assq-ref attributes 'path)))
+
+  (case elem
+    ((at)
+     (values `(at ,(car body) ,(cadr body)) derivations))
+    ((attr)
+     (let ((name (assq-ref attributes 'name)))
+       (cond ((null? body)
+              (values `(attribute-pattern ,name) derivations))
+             ((and (pair? body) (null? (cdr body)))
+              (values `(attribute ,(loc) ,name ,(car body))
+                      derivations))
+             (else
+              (error "invalid attribute body" name (loc) body)))))
+    ((attrs)
+     (values `(attribute-set ,(reverse body)) derivations))
+    ((attrspat)
+     (values `(attribute-set-pattern ,body) derivations))
+    ((bool)
+     (values (string-ci=? "true" (assq-ref attributes 'value))
+             derivations))
+    ((derivation)
+     (let ((drv-path (assq-ref attributes 'drvPath))
+           (out-path (assq-ref attributes 'outPath)))
+       (if (equal? body '(repeated))
+           (let ((body (vhash-assoc drv-path derivations)))
+             (if (pair? body)
+                 (values `(derivation ,drv-path ,out-path ,(cdr body))
+                         derivations)
+                 (error "no previous occurrence of derivation"
+                        drv-path)))
+           (values `(derivation ,drv-path ,out-path ,body)
+                   (vhash-cons drv-path body derivations)))))
+    ((ellipsis)
+     (values '... derivations))
+    ((expr)
+     (values `(snix ,(loc) ,@body) derivations))
+    ((function)
+     (values `(function ,(loc) ,body) derivations))
+    ((int)
+     (values (string->number (assq-ref attributes 'value))
+             derivations))
+    ((list)
+     (values body derivations))
+    ((null)
+     (values 'null derivations))
+    ((path)
+     (values (assq-ref attributes 'value) derivations))
+    ((repeated)
+     (values 'repeated derivations))
+    ((string)
+     (values (assq-ref attributes 'value) derivations))
+    ((unevaluated)
+     (values 'unevaluated derivations))
+    ((varpat)
+     (values `(varpat ,(assq-ref attributes 'name)) derivations))
+    (else (error "unhandled Nix XML element" elem))))
+
+(define xml->snix
+  ;; Return the SNix represention of TREE, an SXML tree as returned by
+  ;; parsing the XML output of `nix-instantiate' on Nixpkgs.
+  (let ((parse
+         (ssax:make-parser NEW-LEVEL-SEED
+                           (lambda (elem-gi attributes namespaces expected-content
+                                    seed)
+                             (cons '() (cdr seed)))
+
+                           FINISH-ELEMENT
+                           (lambda (elem-gi attributes namespaces parent-seed
+                                            seed)
+                             (let ((snix        (car seed))
+                                   (derivations (cdr seed)))
+                               (let-values (((snix derivations)
+                                             (xml-element->snix elem-gi
+                                                                attributes
+                                                                snix
+                                                                derivations)))
+                                 (cons (cons snix (car parent-seed))
+                                       derivations))))
+
+                           CHAR-DATA-HANDLER
+                           (lambda (string1 string2 seed)
+                             ;; Discard inter-node strings, which are blanks.
+                             seed))))
+    (lambda (port)
+      ;; Discard the second value returned by the parser (the derivation
+      ;; vhash).
+      (caar (parse port (cons '() vlist-null))))))
+
+(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 (attribute-value attribute)
+  ;; Return the value of ATTRIBUTE.
+  (match attribute
+    (('attribute _ _ value) value)))
+
+(define (derivation-source derivation)
+  ;; Return the "src" attribute of DERIVATION or #f if not found.
+  (match derivation
+    (('derivation _ _ (attributes ...))
+     (find-attribute-by-name "src" attributes))))
+
+(define (derivation-output-path derivation)
+  ;; Return the output path of DERIVATION.
+  (match derivation
+    (('derivation _ out-path _)
+     out-path)
+    (_ #f)))
+
+(define (source-output-path src)
+  ;; Return the output path of SRC, the "src" attribute of a derivation.
+  (derivation-output-path (attribute-value src)))
+
+(define (derivation-source-output-path derivation)
+  ;; Return the output path of the "src" attribute of DERIVATION or #f if
+  ;; DERIVATION lacks an "src" attribute.
+  (and=> (derivation-source derivation) source-output-path))
+
+(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)))
+
+(define (find-attribute-by-name name attributes)
+  ;; Return attribute NAME in ATTRIBUTES, a list of SNix attributes, or #f if
+  ;; NAME cannot be found.
+  (find (lambda (a)
+          (match a
+            (('attribute _ (? (cut string=? <> name)) _)
+             a)
+            (_ #f)))
+        attributes))
+
+(define (find-package-by-attribute-name name packages)
+  ;; Return the package bound to attribute NAME in PACKAGES, a list of
+  ;; packages (SNix attributes), or #f if NAME cannot be found.
+  (find (lambda (package)
+          (match package
+            (('attribute _ (? (cut string=? <> name))
+                         ('derivation _ _ _))
+             package)
+            (_ #f)))
+        packages))
+
+(define (stdenv-package packages)
+  ;; Return the `stdenv' package from PACKAGES, a list of SNix attributes.
+  (find-package-by-attribute-name "stdenv" packages))
+
+(define (package-requisites package)
+  ;; Return the list of derivations required to build PACKAGE (including that
+  ;; of PACKAGE) by recurring into its derivation attributes.
+  (let loop ((snix   package)
+             (result '()))
+    (match snix
+      (('attribute _ _ body)
+       (loop body result))
+      (('derivation _ out-path body)
+       (if (any (lambda (d)
+                  (match d
+                    (('derivation _ (? (cut string=? out-path <>)) _) #t)
+                    (_ #f)))
+                result)
+           result
+           (loop body (cons snix result))))
+      ((things ...)
+       (fold loop result things))
+      (_ result))))
+
+(define (package-source-output-path package)
+  ;; Return the output path of the "src" derivation of PACKAGE.
+  (derivation-source-output-path (attribute-value package)))
+
+
+;;;
+;;; FTP client.
+;;;
+
+(define-record-type <ftp-connection>
+  (%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-login user pass port)
+  (let ((command (string-append "USER " user (string #\newline))))
+    (display command port)
+    (let-values (((code message) (%ftp-listen port)))
+      (case code
+        ((230)  #t)
+        ((331) (%ftp-command (string-append "PASS " pass) 230 port))
+        (else  (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)
+                (%ftp-login "anonymous" "ludo@example.com" 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 #:optional directory)
+  (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))))
+
+  (if directory
+      (ftp-chdir conn directory))
+
+  (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"
+    "gcc44"
+    "gcc45"
+    "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 _ _ ('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
+    '(("commoncpp2"   "ftp.gnu.org"   "/gnu/commoncpp" #f)
+      ("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)
+      ("grub"         "alpha.gnu.org" "/gnu" #t)
+      ("GNUnet"       "ftp.gnu.org" "/gnu/gnunet" #f)
+      ("mit-scheme"   "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg")
+      ("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))))
+      (_
+       (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
+      ("mitscheme"   . "mit-scheme")
+      ("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))
+               (files (ftp-list conn directory)))
+          (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, --select=SET    Update only packages from SET, which may~%")
+                  (format #t "                      be either `all', `stdenv', or `non-stdenv'.~%")
+                  (format #t "  -d, --dry-run       Don't actually update Nix expressions~%")
+                  (format #t "  -h, --help          Give this help list.~%~%")
+                  (format #t "Report bugs to <ludo@gnu.org>~%")
+                  (exit 0)))
+        (option '(#\s "select") #t #f
+                (lambda (opt name arg result)
+                  (cond ((string-ci=? arg "stdenv")
+                         (alist-cons 'filter 'stdenv result))
+                        ((string-ci=? arg "non-stdenv")
+                         (alist-cons 'filter 'non-stdenv result))
+                        ((string-ci=? arg "all")
+                         (alist-cons 'filter #f result))
+                        (else
+                         (format (current-error-port)
+                                 "~A: unrecognized selection type~%"
+                                 arg)
+                         (exit 1)))))
+
+        (option '(#\d "dry-run") #f #f
+                (lambda (opt name arg result)
+                  (alist-cons 'dry-run #t result)))
+
+        (option '(#\x "xml") #t #f
+                (lambda (opt name arg result)
+                  (alist-cons 'xml-file arg result)))))
+
+(define (gnupdate . args)
+  ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
+  (let* ((opts      (args-fold (cdr 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")))
+         (snix      (begin
+                      (format (current-error-port) "parsing XML...~%")
+                      (xml->snix
+                       (or (and=> (assoc-ref opts 'xml-file) open-input-file)
+                           (open-nixpkgs path)))))
+         (packages  (match snix
+                      (('snix _ ('attribute-set attributes))
+                       attributes)
+                      (_ #f)))
+         (stdenv    (delay
+                      ;; The source tarballs that make up stdenv.
+                      (filter-map derivation-source-output-path
+                                  (package-requisites (stdenv-package packages)))))
+         (gnu       (gnu-packages packages))
+         (gnu*      (case (assoc-ref opts 'filter)
+                      ;; Filter out packages that are/aren't in `stdenv'.  To
+                      ;; do that reliably, we check whether their "src"
+                      ;; derivation is a requisite of stdenv.
+                      ((stdenv)
+                       (filter (lambda (p)
+                                 (member (package-source-output-path p)
+                                         (force stdenv)))
+                               gnu))
+                      ((non-stdenv)
+                       (filter (lambda (p)
+                                 (not (member (package-source-output-path p)
+                                              (force stdenv))))
+                               gnu))
+                      (else gnu)))
+         (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)
+                   (if (assoc-ref opts 'dry-run)
+                       (format #t "`~a' would be updated from ~a to ~a (~a -> ~a)~%"
+                               name old-version new-version
+                               old-hash new-hash)
+                       (update-nix-expression (location-file location)
+                                              old-version old-hash
+                                              new-version new-hash)))
+                  (_ #f)))
+              updates)
+    #t))
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 0359e9c711d..c9f0fb98af7 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,7 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor
+, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
+, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
+, gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio
+, fftwSinglePrec, libmad }:
 
 stdenv.mkDerivation {
-
   name = "ardour-2.8.2";
 
   # svn is the source to get official releases from their site?
@@ -13,11 +16,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    scons boost
-    pkgconfig fftw librdf_raptor librdf_rasqal jackaudio flac
-    libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx libusb cairomm
-    glib pango gtk glibmm gtkmm libgnomecanvas fftw librdf liblo aubio
-    fftw fftwSinglePrec libmad
+    scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
+    flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
+    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf
+    liblo aubio fftwSinglePrec libmad
   ];
 
   buildPhase = ''
@@ -35,7 +37,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://ardour.org/;
     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/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix
index e8205440d5a..61b11c05de7 100644
--- a/pkgs/applications/audio/beast/default.nix
+++ b/pkgs/applications/audio/beast/default.nix
@@ -1,36 +1,37 @@
-args: with args;
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
+, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
+
+stdenv.mkDerivation {
   name = "beast-0.7.1";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://beast.gtk.org/pub/beast/v0.7/beast-0.7.1.tar.bz2;
     sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l";
   };
 
-  buildInputs =[zlib guile libart_lgpl pkgconfig intltool gtk glib
+  buildInputs =
+    [ zlib guile libart_lgpl pkgconfig intltool gtk glib
       libogg libvorbis libgnomecanvas gettext
-      ];
-
-  inherit bash perl;
+    ];
 
   patchPhase = ''
     unset patchPhase; patchPhase
     sed 's=-DG_DISABLE_DEPRECATED==g' -i `find -type f` # the patches didn't remove all occurences
-    sed 's=/bin/bash=/$bash/bin/bash=g' -i `find -type f`
-    sed 's=/usr/bin/perl=/$perl/bin/bash=g' -i `find -type f`
+    sed 's=/bin/bash=/${stdenv.shell}=g' -i `find -type f`
+    sed 's=/usr/bin/perl=/${perl}/bin/perl=g' -i `find -type f`
   '';
 
-  patches = [
-        (fetchurl {
-          url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2;
-          sha256 = "dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e";
-        })
-        ./patch.patch # patches taken from gentoo
-  ];
+  patches =
+    [ (fetchurl {
+        url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2;
+        sha256 = "dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e";
+      })
+      ./patch.patch # patches taken from gentoo
+    ];
 
   meta = { 
-      description = "BEAST - the Bedevilled Sound Engine";
-      homepage = http://beast.gtk.org;
-      license = ["GPL-2" "LGPL-2.1"];
+    description = "BEAST - the Bedevilled Sound Engine";
+    homepage = http://beast.gtk.org;
+    license = ["GPL-2" "LGPL-2.1"];
   };
 }
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix
index 297bc91af4b..97c39982a65 100644
--- a/pkgs/applications/audio/jackmeter/default.nix
+++ b/pkgs/applications/audio/jackmeter/default.nix
@@ -1,23 +1,20 @@
-args: with args;
+{ stdenv, fetchurl, jackaudio, pkgconfig }:
 
-let name = "jackmeter-0.3";
-in
-stdenv.mkDerivation {
-
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "jackmeter-0.3";
 
   src = fetchurl {
     url = "http://www.aelius.com/njh/jackmeter/${name}.tar.gz";
     sha256 = "03siznnq3f0nnqyighgw9qdq1y4bfrrxs0mk6394pza3sz4b6sgp";
   };
 
-  buildInputs = [jackaudio pkgconfig];
+  buildInputs = [ jackaudio pkgconfig ];
 
   meta = { 
-    description = "console jack loudness meter";
+    description = "Console jack loudness meter";
     homepage = http://www.aelius.com/njh/jackmeter/;
     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/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 17174fbebbf..94e1e72d0f5 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -1,27 +1,22 @@
-args: with args;
-	let localDefs = builderDefs.passthru.function {
-		src = 
-		fetchurl {
-			url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
-			sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh";
-		};
-		buildInputs = [fftw ladspaH pkgconfig];
-		configureFlags = [];
-	};
-	in with localDefs;
-let
-	postInstall = fullDepEntry ("
-		ensureDir \$out/share/ladspa/
-		ln -s \$out/lib/ladspa \$out/share/ladspa/lib
-	") [minInit defEnsureDir];
-in
+{ stdenv, fetchurl, fftw, ladspaH, pkgconfig }:
+
 stdenv.mkDerivation {
-	name = "swh-plugins-0.4.15";
-	builder = writeScript "swh-plugins-0.4.15-builder"
-		(textClosure localDefs [doConfigure doMakeInstall 
-			postInstall doForceShare]);
-	meta = {
-		description = "LADSPA format audio plugins";
-		inherit src;
-	};
+  name = "swh-plugins-0.4.15";
+
+  src = fetchurl {
+    url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
+    sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh";
+  };
+  
+  buildInputs = [fftw ladspaH pkgconfig];
+
+  postInstall =
+    ''
+      ensureDir $out/share/ladspa/
+      ln -s $out/lib/ladspa $out/share/ladspa/lib
+    '';
+
+  meta = {
+    description = "LADSPA format audio plugins";
+  };
 }
diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
index 12ea91714a3..8cd3dcc1bfb 100644
--- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
@@ -1,28 +1,28 @@
-args: with args;
+{ stdenv, fetchurl, builderDefs }:
+
 let 
-	src = 
-	fetchurl {
-		url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
-		sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
-	};
+  src = fetchurl {
+    url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
+    sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
+  };
 in
-	let localDefs = builderDefs.passthru.function {
-		buildInputs = [];
-		inherit src;
-	};
-	in with localDefs;
+  let localDefs = builderDefs.passthru.function {
+    buildInputs = [];
+    inherit src;
+  };
+  in with localDefs;
 let
-	copyFile = fullDepEntry ("
-		ensureDir \$out/include
-		cp ${src} \$out/include/ladspa.h
-	") [minInit defEnsureDir];
+  copyFile = fullDepEntry ("
+    ensureDir \$out/include
+    cp ${src} \$out/include/ladspa.h
+  ") [minInit defEnsureDir];
 in
 stdenv.mkDerivation {
-	name = "ladspa.h";
-	builder = writeScript "ladspa.h-builder"
-		(textClosure localDefs [copyFile]);
-	meta = {
-		description = "LADSPA format audio plugins";
-		inherit src;
-	};
+  name = "ladspa.h";
+  builder = writeScript "ladspa.h-builder"
+    (textClosure localDefs [copyFile]);
+  meta = {
+    description = "LADSPA format audio plugins";
+    inherit src;
+  };
 }
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 828fdc0bdde..dbe32f862f2 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,20 +1,20 @@
-args:
-args.stdenv.mkDerivation {
-
-  # some dependencies such as killall have to be installed additionally
+{ stdenv, fetchurl, qt4, alsaLib, jackaudio }:
 
+stdenv.mkDerivation {
   name = "qjackctl-0.3.3";
 
-  src = args.fetchurl {
+  # some dependencies such as killall have to be installed additionally
+
+  src = fetchurl {
     url = http://downloads.sourceforge.net/qjackctl/qjackctl-0.3.3.tar.gz;
     sha256 = "1z9v208fs79ka6ni3p5v5xb0k5y1wqqm2a9cf903387b9p3fhpxj";
   };
 
-  buildInputs =(with args; [qt4 alsaLib jackaudio]);
+  buildInputs = [ qt4 alsaLib jackaudio ];
 
   meta = { 
-      description = "qt jackd control gui tool";
-      homepage = http://qjackctl.sourceforge.net/;
-      license = "GPL";
+    description = "qt jackd control gui tool";
+    homepage = http://qjackctl.sourceforge.net/;
+    license = "GPL";
   };
 }
diff --git a/pkgs/applications/audio/sonic-visualizer/default.nix b/pkgs/applications/audio/sonic-visualizer/default.nix
index 08b300b1c11..6e40baa1c36 100644
--- a/pkgs/applications/audio/sonic-visualizer/default.nix
+++ b/pkgs/applications/audio/sonic-visualizer/default.nix
@@ -1,11 +1,10 @@
 # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
 
-args: with args;
+{ stdenv, fetchurl, libsndfile, qt, fftw, librdf, rubberband
+, libsamplerate, vampSDK, alsaLib, librdf_raptor, librdf_rasqal
+, redland, jackaudio, pulseaudio, libmad, libogg, liblo, bzip2 }:
 
 stdenv.mkDerivation {
-
-#TODO add plugins!
-
   name = "sonic-visualizer-1.6";
 
   src = fetchurl {
@@ -13,16 +12,17 @@ stdenv.mkDerivation {
     sha256 = "1dbqqa7anii2jnjpfwm4sr83nn4bwmz68xw4n6clycsz5iqk52f5";
   };
 
-  buildInputs = [libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
-    libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
-    # optional
-    jackaudio
-    # portaudio
-    pulseaudio
-    libmad
-    libogg # ?
-    # fishsound
-    liblo
+  buildInputs =
+    [ libsndfile qt fftw /* should be fftw3f ??*/ bzip2 librdf rubberband
+      libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
+      # optional
+      jackaudio
+      # portaudio
+      pulseaudio
+      libmad
+      libogg # ?
+      # fishsound
+      liblo
     ];
 
   buildPhase = ''
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     description = "View and analyse contents of music audio files";
     homepage = http://www.sonicvisualiser.org/;
     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/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix
index 223aabcdf82..4dfe3a204d3 100644
--- a/pkgs/applications/editors/bvi/default.nix
+++ b/pkgs/applications/editors/bvi/default.nix
@@ -1,4 +1,5 @@
-args : with args;
+{ stdenv, fetchurl, ncurses }:
+
 stdenv.mkDerivation {
   name = "bvi-1.3.2";
 
@@ -7,11 +8,11 @@ stdenv.mkDerivation {
     sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz";
   };
 
-  buildInputs = [ncurses];
+  buildInputs = [ ncurses ];
 
   meta = { 
-      description = "hex editor with vim style keybindings";
-      homepage = http://bvi.sourceforge.net/download.html;
-      license = "GPL2";
+    description = "Hex editor with vim style keybindings";
+    homepage = http://bvi.sourceforge.net/download.html;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 924234bb446..9dcec717861 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, emacs}:
 
 stdenv.mkDerivation rec {
-  name = "haskell-mode-2.6.1";
+  name = "haskell-mode-2.7.0";
 
   src = fetchurl {
     url = "http://projects.haskell.org/haskellmode-emacs/${name}.tar.gz";
-    sha256 = "cc33fd0d4692667a6eb56fea3dc549de3897d8dbb7b71818489760f45d564a76";
+    sha256 = "8b45c55ed5f2b498529a6d7e01b77fea899c1de93e24653cab188cb3a4f495bc";
   };
 
   buildInputs = [emacs];
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
new file mode 100644
index 00000000000..31efaf8de23
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -0,0 +1,41 @@
+{ fetchurl, stdenv, emacs, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "org-7.01f";
+
+  src = fetchurl {
+    url = "http://orgmode.org/${name}.tar.gz";
+    sha256 = "1db7s57g8gh8w0464n18lxpcz270x9ns63b2blhkz8wrdnk57fia";
+  };
+
+  buildInputs = [ emacs texinfo ];
+
+  configurePhase =
+    '' sed -i Makefile \
+           -e "s|^prefix=.*$|prefix=$out|g"
+    '';
+
+  installPhase =
+    '' make install install-info
+
+       ensureDir "$out/share/doc/${name}"
+       cp -v doc/orgcard*.{pdf,txt} "$out/share/doc/${name}"
+    '';
+
+  meta = {
+    description = "Org-Mode, an Emacs mode for notes, project planning, and authoring";
+
+    longDescription =
+      '' Org-mode is for keeping notes, maintaining ToDo lists, doing project
+         planning, and authoring with a fast and effective plain-text system.
+
+         This package contains a version of Org-mode typically more recent
+         than that found in GNU Emacs.
+      '';
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix
new file mode 100644
index 00000000000..9bb7870fb5a
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix
@@ -0,0 +1,28 @@
+{stdenv, fetchurl}:
+
+let
+    version = "0.2-4";
+in
+stdenv.mkDerivation
+{
+  name = "rudel-${version}";
+  src = fetchurl
+  {
+    url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz";
+    sha256 = "68247bfb702d929877f6d098932e8b0ca45c573a3510187e1ccc43e5ea194f25";
+  };
+
+  installPhase = ''
+    for n in . obby zeroconf jupiter; do
+      ensureDir "$out/share/emacs/site-lisp/$n";
+      cp $n/*.el "$out/share/emacs/site-lisp/$n/";
+    done
+    install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf"
+  '';
+
+  meta = {
+    homepage = "http://rudel.sourceforge.net/";
+    description = "Rudel is a collaborative editing environment for GNU Emacs";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index c43b7f86914..f49919b70bb 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, ant }:
+
 stdenv.mkDerivation {
   name = "jedit-4.2";
 
@@ -18,11 +19,11 @@ stdenv.mkDerivation {
     cp modes/catalog \$out/lib/modes
   ";
 
-  buildInputs = [ant];
+  buildInputs = [ ant ];
 
   meta = { 
-      description = "really nice programmers editor written in Java. Give it a try";
-      homepage = http://www.jedit.org;
-      license = "GPL";
+    description = "really nice programmers editor written in Java. Give it a try";
+    homepage = http://www.jedit.org;
+    license = "GPL";
   };
 }
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 62d5347d0ea..974ced7d2b1 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, ncurses, gettext }:
+
 stdenv.mkDerivation (rec {
   pname = "nano";
   version = "2.2.3";
@@ -9,9 +10,10 @@ stdenv.mkDerivation (rec {
     url = "mirror://gnu/nano/${name}.tar.gz";
     sha256 = "1vpl993xrpj8bqi1ayga8fc0j2jag90xp6rqakzwm3bxw71hmwi2";
   };
-  buildInputs = [ncurses gettext];
-#  configureFlags = "--enable-tiny";
-  configureFlags = "
+  
+  buildInputs = [ ncurses gettext ];
+  
+  configureFlags = ''
     --disable-browser 
     --disable-help 
     --disable-justify 
@@ -20,7 +22,7 @@ stdenv.mkDerivation (rec {
     --disable-speller
     --disable-tabcomp
     --disable-wrapping
-  ";
+  '';
 
   meta = {
     homepage = http://www.nano-editor.org/;
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 1fd01a55fd7..6f6a592a02d 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,86 +1,17 @@
-args:
-let 
-	defList = [];
-	#stdenv and fetchurl are added automatically
-	getVal = (args.lib.getValue args defList);
-	check = args.lib.checkFlag args;
-	reqsList = [
-	["gtkGUI" "glib" "gtk" "pkgconfig" "libXpm" "libXext" "x11Support"]
-	["athenaGUI" "libXau" "libXt" "libXaw" "libXpm" "libXext" "x11Support"]
-	["x11Support" "libX11"]
-	["hugeFeatures"]
-	["pythonSupport" "python"]
-	["perlSupport" "perl"]
-	["tclSupport" "tcl"]
-	["eclSupport" "ecl" "gmp" "mpfr"]
-	["luaSupport" "lua"]
+{ stdenv, fetchurl, ncurses }:
 
-	# Currently causes problems
-	["mzSchemeSupport" "pltScheme"]
-
-	["perlSupport" "perl"]
-	["rubySupport" "ruby"]
-	["hangulSupport"]
-	["sniffSupport"]
-	["gettextSupport" "gettext"]
-	["true" "ncurses"]
-	["false" "libSM"]
-	];
-	nameSuffixes = [
-	"hugeFeatures" "-huge"
-	"x11Support" "-X11"
-	"pythonSupport" "-python"
-	"perlSupport" "-perl"
-	"tclSupport" "-tcl"
-	"ximSupport" "-xim"
-	"eclSupport" "-ecl"
-	"luaSupport" "-lua"
-	"perlSupport" "-perl"
-	"rubySupport" "-ruby"
-	"mzSchemeSupport" "-mzscheme"
-	];
-	configFlags = [
-	"true" " --enable-multibyte "
-	"x11Support" " --enable-gui=auto "
-	"hugeFeatures" "--with-features=huge --enable-cscope --enable-xsmp "
-	"pythonSupport" " --enable-pythoninterp "
-	"perlSupport" " --enable-perlinterp "
-	"tclSupport" " --enable-tclinterp "
-	"ximSupport" " --enable-xim "
-	"eclSupport" " --enable-eclinterp "
-	"hangulSupport" " --enable-hangulinput "
-	"perlSupport" " --enable-perlinterp "
-	"luaSupport" " --enable-luainterp --with-lua-prefix=${args.lua} "
-	"rubySupport" " --enable-rubyinterp "
-	"sniffSupport" " --enable-sniff "
-	"mzSchemeSupport" " --enable-mzschemeinterp "
-	"gettextSupport" " --enable-nls "
-	];
-	buildInputsNames = args.lib.filter (x: (null!=getVal x)) 
-		(args.lib.uniqList {inputList = 
-		(args.lib.concatLists (map 
-		(x:(if (x==[]) then [] else builtins.tail x)) 
-		reqsList));});
-in
-	assert args.lib.checkReqs args defList reqsList;
-args.stdenv.mkDerivation {
-  name = args.lib.condConcat "vim-7.2" nameSuffixes check;
+stdenv.mkDerivation rec {
+  name = "vim-7.2";
  
-  src = args.lib.attrByPath ["src"] (args.fetchurl {
-    url = ftp://ftp.vim.org/pub/vim/unix/vim-7.2.tar.bz2;
+  src = fetchurl {
+    url = "ftp://ftp.vim.org/pub/vim/unix/${name}.tar.bz2";
     sha256 = "11hxkb6r2550c4n13nwr0d8afvh30qjyr5c2hw16zgay43rb0kci";
-  }) args;
+  };
  
-  inherit (args) ncurses;
-
-  buildInputs = args.lib.filter (x: (x!=null)) (map getVal buildInputsNames);
+  buildInputs = [ ncurses ];
 
   postInstall = "ln -s $out/bin/vim $out/bin/vi";
-  preBuild="touch src/auto/link.sed";
-  configureFlags = args.lib.condConcat "" configFlags check;
-
-  NIX_LDFLAGS = "-lpthread -lutil";
-
+  
   meta = {
     description = "The most popular clone of the VI editor";
     homepage = http://www.vim.org;
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 7f5ae134a3d..36bccbac557 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "zile-2.3.16";
+  name = "zile-2.3.17";
 
   src = fetchurl {
     url = "mirror://gnu/zile/${name}.tar.gz";
-    sha256 = "1lm24sw2ziqsib11sddz7gcqzw5iwfnsx65m1i461kxq218xl59h";
+    sha256 = "1wrg53qz0s4336nq8z2v7pi18vpz5ifxvlwq4jv0w4rwmbksgvi0";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 06438cc45f9..5ebb070ef1f 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{stdenv, fetchurl, djvulibre, qt4 }:
 
 stdenv.mkDerivation {
 	name = "djview4-4.1-2";
@@ -13,5 +13,7 @@ stdenv.mkDerivation {
 		homepage = http://djvu.sourceforge.net/djview4.html;
 		description = "A new portable DjVu viewer and browser plugin";
 		license = "GPL2";
+    inherit (qt4.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
 	};
 }
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 6a8b3d6499b..65c86a6cf97 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -1,8 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, fltk, openexr, mesa, which, openexr_ctl }:
 
 assert fltk.glSupport;
-stdenv.mkDerivation {
 
+stdenv.mkDerivation {
   name ="openexr_viewers-1.0.1";
 
   src = fetchurl {
@@ -10,18 +10,18 @@ stdenv.mkDerivation {
     sha256 = "1w5qbcdp7sw48z1wk2v07f7p14vqqb1m2ncxyxnbkm9f4ab0ymg6";
   };
 
-  inherit fltk mesa;
-
-  configurePhase = "
-    # don't know why.. adding these flags it works
-    #export CXXFLAGS=`fltk-config --use-gl --cxxflags --ldflags`
-    ./configure --prefix=\$out --with-fltk-config=\$fltk/bin/fltk-config";
+  configurePhase =
+    ''
+      # don't know why.. adding these flags it works
+      #export CXXFLAGS=`fltk-config --use-gl --cxxflags --ldflags`
+      ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config
+    '';
 
-  buildInputs = [openexr fltk pkgconfig mesa which openexr_ctl];
+  buildInputs = [ openexr fltk pkgconfig mesa which openexr_ctl ];
 
   meta = { 
-      description = "tool to view OpenEXR images";
-      homepage = http://openexr.com;
-      license = "BSD-like";
+    description = "Tool to view OpenEXR images";
+    homepage = http://openexr.com;
+    license = "BSD-like";
   };
 }
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index a4c272ac98a..076c0360a08 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,15 +1,27 @@
 { stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
-, intltool, gettext }:
+, intltool, gettext, libchamplain }:
 
 stdenv.mkDerivation rec {
-  name = "geeqie-1.0beta2";
+  name = "geeqie-1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/geeqie/${name}.tar.gz";
-    sha256 = "13h924iykmxwgpx562lrsh2j78fnzyyfmg4w7qgj9vbjq18nq7fd";
+    sha256 = "1p8z47cqdqqkn8b0fr5bqsfinz4dgqk4353s8f8d9ha6cik69bfi";
   };
 
-  buildInputs = [ pkgconfig gtk libpng exiv2 lcms intltool gettext ];
+  preConfigure =
+    # XXX: Trick to have Geeqie use the version we have.
+    '' sed -i "configure" \
+           -e 's/champlain-0.4/champlain-0.6/g ;
+               s/champlain-gtk-0.4/champlain-gtk-0.6/g'
+    '';
+
+  configureFlags = [ "--enable-gps" ];
+
+  buildInputs =
+    [ pkgconfig gtk libpng exiv2 lcms intltool gettext
+      libchamplain
+    ];
 
   meta = {
     description = "Geeqie, a lightweight GTK+ based image viewer";
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index e26b2b3d9ef..c5fe5d6cdd9 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.6.8";
+  name = "gimp-2.6.10";
   
   src = fetchurl {
     url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
-    sha256 = "0cikkb4l6psankz9yhgal934b41nwk6d5a93r9zib413fj5j3m6m";
+    sha256 = "0cp0abdmqczncy0miazbyd61sjm63r1mhlwsvbz8lb9m7gkkyypg";
   };
   
   buildInputs = [
diff --git a/pkgs/applications/graphics/gocr/0.44.nix b/pkgs/applications/graphics/gocr/0.44.nix
deleted file mode 100644
index 4d3d33f58f5..00000000000
--- a/pkgs/applications/graphics/gocr/0.44.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-fetchurl {
-		url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
-		sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
-	};
-
-		buildInputs = [];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "gocr";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "GPL Optical Character Recognition";
-		inherit src;
-	};
-}
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix
new file mode 100644
index 00000000000..4b2ebceda47
--- /dev/null
+++ b/pkgs/applications/graphics/gocr/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "gocr-0.44";
+
+  src = fetchurl {
+    url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
+    sha256 = "0kvb7cbk6z5n4g0hhbwpdk2f3819yfamwsmkwanj99yhni6p5mr0";
+  };
+
+  meta = {
+    description = "GPL Optical Character Recognition";
+  };
+}
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 816bd5aa48a..b1a940b9b56 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -3,15 +3,13 @@
  glew, libXmu, libXi }:
 
 stdenv.mkDerivation rec {
-  name = "hugin-2009.4.0";
+  name = "hugin-2010.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/hugin/${name}.tar.gz";
-    sha256 = "1xa7rnpwlv68wfkikmlrs74hqylpkh837p3narqljr2a7fxf04r9";
+    sha256 = "08xm7ggfrh536lqvdzw7zg09p2awbclw5r7i8c59gf092w1cac7d";
   };
 
-#   patches = [ ./levmar-64-bit-alignment.patch ];
-
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
   NIX_LDFLAGS = "-lrt";
diff --git a/pkgs/applications/graphics/hugin/levmar-64-bit-alignment.patch b/pkgs/applications/graphics/hugin/levmar-64-bit-alignment.patch
deleted file mode 100644
index b0c39e378ec..00000000000
--- a/pkgs/applications/graphics/hugin/levmar-64-bit-alignment.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-This patch fixes alignment issues on 64-bit machines.  It was taken
-from http://www.mail-archive.com/hugin-ptx@googlegroups.com/msg02976.html .
-See also http://thread.gmane.org/gmane.linux.distributions.nixos/2352 .
-
---- hugin/src/foreign/levmar/misc_core.c	2009-04-28 13:30:33.000000000 +0200 # SVN 3799
-+++ hugin/src/foreign/levmar/misc_core.c	2009-05-04 07:49:00.000000000 +0200 # Merged patch.pt and fix_alias.diff
-@@ -332,7 +332,7 @@
-   a_sz=m*m;
-   u_sz=m*m; s_sz=m; vt_sz=m*m;
- 
--  tot_sz=iworksz*sizeof(int) + (a_sz + u_sz + s_sz + vt_sz + worksz)*sizeof(LM_REAL);
-+  tot_sz=(a_sz + u_sz + s_sz + vt_sz + worksz)*sizeof(LM_REAL) + iworksz*sizeof(int); /* should be arranged in that order for proper doubles alignment */
- 
-     buf_sz=tot_sz;
-     buf=(LM_REAL *)malloc(buf_sz);
-@@ -414,25 +414,27 @@
- int buf_sz=0;
- 
- register int i, j, k, l;
--int *idx, maxi=-1, idx_sz, a_sz, x_sz, work_sz, tot_sz;
-+int *idxbuf, *idx, maxi=-1, idx_sz, a_sz, x_sz, work_sz, tot_sz;
- LM_REAL *a, *x, *work, max, sum, tmp;
- 
-   /* calculate required memory size */
-   idx_sz=m;
-+  idxbuf=(void *)malloc(idx_sz*sizeof(int));
-+
-   a_sz=m*m;
-   x_sz=m;
-   work_sz=m;
--  tot_sz=idx_sz*sizeof(int) + (a_sz+x_sz+work_sz)*sizeof(LM_REAL);
-+  tot_sz=(a_sz + x_sz + work_sz)*sizeof(LM_REAL) + idx_sz*sizeof(int); /* should be arranged in that order for proper doubles alignment */
- 
-   buf_sz=tot_sz;
-   buf=(void *)malloc(tot_sz);
--  if(!buf){
-+  if(!buf || !idxbuf){
-     fprintf(stderr, RCAT("memory allocation in ", LEVMAR_LUINVERSE) "() failed!\n");
-     exit(1);
-   }
- 
--  idx=(int *)buf;
--  a=(LM_REAL *)(idx + idx_sz);
-+  idx=(int *)idxbuf;
-+  a=(LM_REAL *)buf;
-   x=a + a_sz;
-   work=x + x_sz;
- 
-@@ -448,6 +450,7 @@
- 		  if(max==0.0){
-         fprintf(stderr, RCAT("Singular matrix A in ", LEVMAR_LUINVERSE) "()!\n");
-         free(buf);
-+	free(idxbuf);
- 
-         return 0;
-       }
-@@ -522,6 +525,7 @@
-   }
- 
-   free(buf);
-+  free(idxbuf);
- 
-   return 1;
- }
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 8cd98aef136..a3910fae2bf 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
+, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
+, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
+, gsl, python, pyxml, lxml }:
 
 stdenv.mkDerivation rec {
   name = "inkscape-0.47";
@@ -45,6 +48,5 @@ stdenv.mkDerivation rec {
 
       If you want to import .eps files install ps2edit.
     '';
-
   };
 }
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 1de10bd2af9..8ddaf9bc279 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -1,49 +1,37 @@
 {stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "meshlab-1.2.2";
+  name = "meshlab-1.2.3a";
 
   src = fetchurl {
-    url = mirror://sourceforge/meshlab/MeshLabSrc_v122.tar.gz;
-    sha256 = "166a8mx72wf3r84pnpr0ssqkd2xw6y5brviywlj8rjk6w9cy8fdc";
+    url = mirror://sourceforge/meshlab/MeshLabSrc_AllInc_v123a.tgz;
+    sha256 = "09w42q0x1yjr7l9ng952lic7vkb1arsvqg1fld5s297zwzfmsl9v";
   };
 
-  srcGlew151 = fetchurl {
-    url = mirror://sourceforge/glew/glew-1.5.1-src.tgz;
-    sha256 = "02n1p6s6sia92fgng9iq0kqq890rga8d8g0y34mc6qxmbh43vrl9";
-  };
-
-  srcQHull20031 = fetchurl {
-    url = http://www.qhull.org/download/qhull-2003.1.zip;
-    sha256 = "07mh371i6xs691qz6wwzkqk9h0d2dkih2q818is2b041w1l79b46";
-  };
+  # I don't know why I need this; without this, the rpath set at the beginning of the
+  # buildPhase gets removed from the 'meshlab' binary
+  dontPatchELF = true;
 
-
-  patchPhase = ''
+  buildPhase = ''
+    export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS"
     cd meshlab/src
-    mkdir external
     pushd external
-    tar xf ${srcGlew151}
-    mv glew glew-1.5.1
-    unzip ${srcQHull20031}
+    qmake -recursive external.pro
+    make
     popd
-  '';
-
-  buildPhase = ''
-    pwd
     qmake -recursive meshlabv12.pro
     make
   '';
 
   installPhase = ''
-    ensureDir $out/opt/meshlab $out/bin
-    pushd meshlab
-    cp -R meshlab plugins shaders* textures images $out/opt/meshlab
+    ensureDir $out/opt/meshlab $out/bin $out/lib
+    pushd distrib
+    cp -R * $out/opt/meshlab
     popd
     ln -s $out/opt/meshlab/meshlab $out/bin/meshlab
   '';
 
-  buildInputs = [ qt bzip2 lib3ds levmar muparser unzip ];
+  buildInputs = [ qt unzip ];
 
   meta = {
     description = "System for the processing and editing of unstructured 3D triangular meshes";
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
new file mode 100644
index 00000000000..801ed7a1b61
--- /dev/null
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchgit, mono, gtksharp, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "pinta-0.3";
+
+  src = fetchgit {
+    url = http://github.com/jpobst/Pinta.git;
+    rev = "0.3";
+    sha256 = "17fde1187be4cfd50a9acda4ba45584e24d51ff22df5074654bed23f61faf33b";
+  };
+
+  buildInputs = [mono gtksharp pkgconfig];
+
+  buildPhase = ''
+    # xbuild understands pkgconfig, but gtksharp does not give .pc for gdk-sharp
+    # So we have to go the GAC-way
+    export MONO_GAC_PREFIX=${gtksharp}
+    xbuild Pinta.sln
+  '';
+
+  # Very ugly - I don't know enough Mono to improve this. Isn't there any rpath in binaries?
+  installPhase = ''
+    ensureDir $out/lib/pinta $out/bin
+    cp bin/*.{dll,exe} $out/lib/pinta
+    cat > $out/bin/pinta << EOF
+    #!/bin/sh
+    export MONO_GAC_PREFIX=${gtksharp}:\$MONO_GAC_PREFIX
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gtksharp}/lib:${gtksharp.gtk}/lib:${mono}/lib
+    exec ${mono}/bin/mono $out/lib/pinta/Pinta.exe
+    EOF
+    chmod +x $out/bin/pinta
+  '';
+
+  # Always needed on Mono, otherwise nothing runs
+  dontStrip = true; 
+
+  meta = {
+    homepage = http://www.pinta-project.com/;
+    description = "Drawing/editing program modeled after Paint.NET";
+    license = "MIT";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix
new file mode 100644
index 00000000000..b40a7251283
--- /dev/null
+++ b/pkgs/applications/graphics/wings/default.nix
@@ -0,0 +1,40 @@
+{ fetchurl, stdenv, erlang, esdl }:
+
+stdenv.mkDerivation rec {
+  name = "wings-1.3.0.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/wings/${name}.tar.bz2";
+    sha256 = "1zab1qxhgrncwqj1xg6z08m0kqbkdiqp4777p1bv2kczcf31isyp";
+  };
+
+  ERL_LIBS = "${esdl}/lib/erlang/addons";
+
+  patchPhase = ''
+    sed -i 's,include("sdl_keyboard.hrl"),include_lib("esdl/include/sdl_keyboard.hrl"),' \
+      src/wings_body.erl plugins_src/commands/wpc_constraints.erl
+  '';
+
+  buildInputs = [ erlang esdl ];
+
+  installPhase = ''
+    ensureDir $out/bin $out/lib/${name}/ebin
+    cp ebin/* $out/lib/${name}/ebin
+    cp -R fonts textures shaders plugins $out/lib/$name
+    cat << EOF > $out/bin/wings
+    #!/bin/sh
+    export ROOTDIR=$out/lib/erlang/addons/${name}
+    ${erlang}/bin/erl -smp disable -pa ${esdl}/lib/erlang/addons/${esdl.name}/ebin \
+      -pa $out/lib/${name}/ebin -run wings_start start_halt "$@"
+    EOF
+    chmod +x $out/bin/wings
+  '';
+
+  meta = {
+    homepage = http://www.wings3d.com/;
+    description = "Subdivision modeler inspired by Nendo and Mirai from Izware";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
+
diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix
index 7dfe31f8957..7c9af7f2545 100644
--- a/pkgs/applications/graphics/xscreensaver/default.nix
+++ b/pkgs/applications/graphics/xscreensaver/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk                     
-, libxml2, libglade }:                                                                 
+x@{ pkgconfig, bc, perl, xlibs, libjpeg, mesa, gtk
+, libxml2, libglade, builderDefsPackage, ... }:                                                                 
 
-stdenv.mkDerivation rec {
-  name = "xscreensaver-5.10";
+builderDefsPackage 
+(a: rec {
+  version = "5.11";
+  name = "xscreensaver-${version}";
+  url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
 
-  src = fetchurl {
-    url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
-    sha256 = "07zy157wqwgcapqycyv89yabxa8byk4p8jn3zlvhf7lx5w1xmval";
+  src = a.fetchurl {
+    inherit url;
+    sha256="0w47s0qd8ab6ywhhhkqjx0grb2b28bh2flnkdpj3yaind202l0s7";
   };
 
-  buildInputs =
+  buildInputs = with a;
     [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade
       xlibs.xlibs xlibs.libXmu
     ];
@@ -18,19 +21,21 @@ stdenv.mkDerivation rec {
     [ "--with-gl"
       "--with-dpms"
       "--with-pixbuf"
-      "--with-x-app-defaults=\$out/share/xscreensaver/app-defaults"
-      "--with-hackdir=\$out/share/xscreensaver-hacks"
+      "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
+      "--with-hackdir=\${out}/share/xscreensaver-hacks"
     ];
 
-  preConfigure =
+  preConfigure = a.fullDepEntry
     ''
       sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
         -i driver/Makefile.in po/Makefile.in.in
-    '';
+    '' ["minInit" "doUnpack"];
+
+  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
 
   meta = {
     description = "A set of screensavers";
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.allBut "i686-cygwin";
+    maintainers = [ a.lib.maintainers.raskin ];
+    platforms = a.lib.platforms.allBut "i686-cygwin";
   };
-}
+}) x
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index 3e200a312c7..50aa92f8d29 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -1,15 +1,16 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, lib, fetchurl, alsaLib, libao, lame, libmad }:
 
-    name = "sox-14.3.0";
+let inherit (composableDerivation) edf; in
 
-    src = args.fetchurl {
-      url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
-      sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
-    };
+composableDerivation.composableDerivation {} {
+  name = "sox-14.3.0";
 
-    flags =
+  src = fetchurl {
+    url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
+    sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
+  };
+
+  flags =
     # are these options of interest? We'll see
     #--disable-fftw          disable usage of FFTW
     #--enable-debug          enable debugging
@@ -23,39 +24,21 @@ composableDerivation {} {
     // edf { name = "dl-mad"; enable.buildInputs = [ libmad ]; } # use shared library
     // edf { name = "mad";    enable.buildInputs =[ libmad ]; }
     ;
-    # These options should be autodetected by the configure script
-    /*
-    --without-sndfile       Don't try to use libsndfile
-    --without-ogg           Don't try to use Ogg Vorbis
-    --without-flac          Don't try to use FLAC
-    --without-ffmpeg        Don't try to use ffmpeg
-    --without-mad           Don't try to use MAD (MP3 Audio Decoder)
-    --without-lame          Don't try to use LAME (LAME Ain't an MP3 Encoder)
-    --without-amr-wb        Don't try to use amr-wb
-    --without-amr-nb        Don't try to use amr-nb
-    --without-samplerate    Don't try to use libsamplerate (aka Secret Rabbit
-                            Code)
-    --without-ladspa        Don't try to use LADSPA
-    --with-ladspa-path      Default search path for LADSPA plugins
-    */
-
 
   cfg = {
     ossSupport = false;
     sun_audioSupport = false;
-  } // lib.listToAttrs [
-      { name = "dl-lameSupport"; value = true; }
+  } // lib.listToAttrs
+    [ { name = "dl-lameSupport"; value = true; }
       { name = "dl-madSupport"; value = true; }
-  ];
+    ];
 
   configureFlags = ["-enable-dl-lame"];
 
-
   optionals = [ "libsndfile" "libogg" "flac" "ffmpeg" "libmad" "lame"
                  /* "amr-wb" "amr-nb" */
                 "libsamplerate" /* "ladspa" */ ];
 
-
   meta = {
     description = "Sample Rate Converter for audio";
     homepage = http://www.mega-nerd.com/SRC/index.html;
diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix
index 24429cfddad..ab22312e903 100644
--- a/pkgs/applications/misc/audio/wavesurfer/default.nix
+++ b/pkgs/applications/misc/audio/wavesurfer/default.nix
@@ -1,13 +1,14 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, snack, tcl, tk, makeWrapper }:
+
+stdenv.mkDerivation {
   name = "wavesurfer-1.8.5";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz;
     sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807";
   };
 
-  buildInputs =(with args; [snack tcl tk makeWrapper]);
+  buildInputs = [ snack tcl tk makeWrapper ];
 
   installPhase = ''
     ensureDir $out/{bin,nix-support,share/wavesurfer/}
@@ -15,13 +16,13 @@ args.stdenv.mkDerivation {
     mv * $out/nix-support
     ln -s $out/{nix-support,bin}/wavesurfer.tcl
     wrapProgram "$out/nix-support/wavesurfer.tcl"  \
-                 --set TCLLIBPATH "${args.snack}/lib" \
-                 --prefix PATH : "${args.tcl}/bin:${args.tk}/bin"
+                 --set TCLLIBPATH "${snack}/lib" \
+                 --prefix PATH : "${tcl}/bin:${tk}/bin"
   '';
 
   meta = { 
-      description = "tool for recording, playing, editing, viewing and labeling of audio";
-      homepage = http://www.speech.kth.se/wavesurfer/;
-      license = "BSD";
+    description = "Tool for recording, playing, editing, viewing and labeling of audio";
+    homepage = http://www.speech.kth.se/wavesurfer/;
+    license = "BSD";
   };
 }
diff --git a/pkgs/applications/misc/bluez-firmware/default.nix b/pkgs/applications/misc/bluez-firmware/default.nix
deleted file mode 100644
index f38a269408d..00000000000
--- a/pkgs/applications/misc/bluez-firmware/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "bluez-firmware-1.1";
-  src = fetchurl {
-    url = http://bluez.sf.net/download/bluez-firmware-1.1.tar.gz;
-    md5 = "2f1c2d939108c865dd07bae3e819c573";
-  };
-
-  meta = {
-    homepage = http://www.bluez.org;
-  };
-}
diff --git a/pkgs/applications/misc/bluez-utils/default.nix b/pkgs/applications/misc/bluez-utils/default.nix
deleted file mode 100644
index 06bc2b2555f..00000000000
--- a/pkgs/applications/misc/bluez-utils/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, bluezLibs}:
-
-stdenv.mkDerivation {
-  name = "bluez-utils-2.25";
-  src = fetchurl {
-    url = http://bluez.sf.net/download/bluez-utils-2.25.tar.gz;
-    md5 = "ae3729ab5592be06ed01b973d4b3e9fe";
-  };
-  buildInputs = [bluezLibs];
-
-  meta = {
-    homepage = http://www.bluez.org;
-  };
-}
diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix
index f4ad3cc8421..4eb4c441c99 100644
--- a/pkgs/applications/misc/d4x/default.nix
+++ b/pkgs/applications/misc/d4x/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }:
+
 stdenv.mkDerivation {
   name = "d4x-2.5.7.1";
   
@@ -12,11 +13,12 @@ stdenv.mkDerivation {
   configurePhase = "./configure --prefix=\$out "
     + " --with-boost-libdir=\$boost/lib"
     + " --with-boost-includedir=\$boost/include";
-  buildInputs = [gtk glib pkgconfig openssl boost];
+    
+  buildInputs = [ gtk glib pkgconfig openssl boost ];
 
   meta = { 
-      description = "graphical download manager";
-      homepage = http://www.krasu.ru/soft/chuchelo/;
-      license = "Artistic";
+    description = "Graphical download manager";
+    homepage = http://www.krasu.ru/soft/chuchelo/;
+    license = "Artistic";
   };
 }
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index 0b052b094e2..0826f7241c4 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, useQt3 ? true, libjpeg, libtiff, libpng, ghostscript
+{ stdenv, fetchurl, lib, useQt3 ? false, libjpeg, libtiff, libpng, ghostscript
 , libungif, zlib, x11, libX11, mesa, qt3 }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/applications/misc/flite/default.nix b/pkgs/applications/misc/flite/default.nix
index ad3b9df164d..8a2414ec885 100644
--- a/pkgs/applications/misc/flite/default.nix
+++ b/pkgs/applications/misc/flite/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "flite-1.3-release";
 
@@ -7,20 +8,22 @@ stdenv.mkDerivation {
     sha256 = "12wanxx57bbqgkag54dlqzv6h2kr9053p0z8mkxs0mqy03vja8lj";
   };
 
-  buildPhase = "
-    unset buildPhase
-    ensureDir \$out/lib
-    buildPhase
-  ";
+  buildPhase =
+    ''
+      unset buildPhase
+      ensureDir $out/lib
+      buildPhase
+    '';
 
-  installPhase = "
-    ensureDir \$out/share/flite
-    cp -r bin \$out
-  ";
+  installPhase =
+    ''
+      ensureDir $out/share/flite
+      cp -r bin $out
+    '';
 
   meta = { 
-      description = "Flite text to speech engine";
-      homepage = http://www.speech.cs.cmu.edu/flite/download.html;
-      license = "BSD as-is";
+    description = "Flite text to speech engine";
+    homepage = http://www.speech.cs.cmu.edu/flite/download.html;
+    license = "BSD as-is";
   };
 }
diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix
index f0e5f6ab078..dd6f205eca8 100644
--- a/pkgs/applications/misc/freemind/default.nix
+++ b/pkgs/applications/misc/freemind/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, jdk, jre, ant, coreutils, gnugrep }:
+
 stdenv.mkDerivation {
   name = "freemind-0.9.0_RC_6";
 
@@ -7,43 +8,44 @@ stdenv.mkDerivation {
     sha256 = "0qxpwqmb4xd8c83zh76gczmx0hsx5m209k7p60kh7c4f25snhngf";
   };
 
-  buildInputs = [jdk ant];
+  buildInputs = [ jdk ant ];
 
-  phases="unpackPhase patchPhase buildPhase installPhase";
+  phases = "unpackPhase patchPhase buildPhase installPhase";
 
-  patchPhase=''
+  patchPhase = ''
     # There is a complain about this. I don't understand it.
     mkdir plugins/plugins
   '';
 
   buildPhase="ant dist";
-# LIBXCB_ALLOW_SLOPPY_LOCK=true :
-# don't know yet what this option really means but I'm no longer getting
-#   Checking Java Version...
-#   Locking assertion failure.  Backtrace:
-#   java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
-# this way
-# reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
-# JDK 7 beta seems to have fixed this (bug ?)
-
-  installPhase=''
+  
+  # LIBXCB_ALLOW_SLOPPY_LOCK=true :
+  # don't know yet what this option really means but I'm no longer getting
+  #   Checking Java Version...
+  #   Locking assertion failure.  Backtrace:
+  #   java: xcb_xlib.c:82: xcb_xlib_unlock: Assertion `c->xlib.lock' failed
+  # this way
+  # reference and more info https://bugs.launchpad.net/ubuntu/+source/sun-java5/+bug/86103
+  # JDK 7 beta seems to have fixed this (bug ?)
+
+  installPhase = ''
     ensureDir $out/{bin,nix-support}
     cp -r ../bin/dist $out/nix-support
     sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
     cat > $out/bin/freemind << EOF
     #!/bin/sh
-    export PATH=${args.coreutils}/bin:${args.gnugrep}/bin:"$PATH"
+    export PATH=${coreutils}/bin:${gnugrep}/bin:"$PATH"
     export JAVA_HOME="${jre}"
     export LIBXCB_ALLOW_SLOPPY_LOCK=true
     $out/nix-support/dist/freemind.sh
     EOF
 
     chmod +x $out/{bin/freemind,nix-support/dist/freemind.sh}
-    '';
+  '';
 
   meta = {
-      description = "mind mapping software";
-      homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
-      license = "GPL";
+    description = "Mind-mapping software";
+    homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page;
+    license = "GPL";
   }; 
 }
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index a82715fc13c..6b08069054c 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
+, curl, cdparanoia, libid3tag }:
 
 stdenv.mkDerivation {
   name = "grip-3.2.0";
@@ -8,13 +9,13 @@ stdenv.mkDerivation {
     sha256 = "1jh5x35rq15n8ivlp9wbdx8x9mj6agf5rfdv8sd6gai851zsclas";
   };
 
-  buildInputs = [gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag];
+  buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ];
 
   meta = { 
-    description = "GTK+ based Audio CD Player/Ripper";
+    description = "GTK+-based audio CD player/ripper";
     homepage = http://nostatic.org/grip;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     #platforms = args.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 7df11653b04..93748e21aba 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -1,26 +1,34 @@
 { stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick,
   TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate,
   CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple
-  , git ? null
-  , monotone ? null
-  , extraUtils ? []
-  }:
+, gitSupport ? false
+, git ? null
+, monotoneSupport ? false
+, monotone ? null
+, extraUtils ? []
+}:
+
+assert gitSupport -> (git != null);
+assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20100515";
+  version = "3.20100704";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "143f245196d98ab037a097402420208da14506d6a65793d042daef5dd765ddd7";
+    sha256 = "1kakh2bf9k0fhvqhn9p9g4wwck64if2y9z23zmlcrm02bw1m6lr9";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
     TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
-    RpcXML XMLSimple PerlMagick git monotone];
+    RpcXML XMLSimple PerlMagick]
+    ++ stdenv.lib.optionals gitSupport [git]
+    ++ stdenv.lib.optionals monotoneSupport [monotone];
+
 
   patchPhase = ''
     sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man
diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix
index 69ec74337df..6ceca2ea871 100644
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/pkgs/applications/misc/jigdo/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, db45, gtk, bzip2 }:
 
 stdenv.mkDerivation {
   name = "jigdo-0.7.3";
@@ -9,18 +9,18 @@ stdenv.mkDerivation {
     sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
   };
 
-  buildInputs = [db45 gtk bzip2];
+  patches = fetchurl {
+    url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
+    sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
+  };
+  
+  buildInputs = [ db45 gtk bzip2 ];
 
   configureFlags = "--without-libdb";
 
   meta = { 
-    description = "tool designed to ease the distribution of very large files over the internet";
+    description = "Download utility that can fetch files from several sources simultaneously";
     homepage = http://atterer.net/jigdo/;
     license = "GPLv2";
   };
-
-  patches = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
-    sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
-  };
 }
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 3c88423d045..4c29855da07 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
     homepage = http://merkaartor.org/;
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
+    platforms = qt.meta.platforms;
   };
 }
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix
index e7d83fd828e..b11b234eb43 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/misc/mrxvt/default.nix
@@ -1,12 +1,13 @@
-args: with args;
-stdenv.mkDerivation {
+{ stdenv, fetchurl, libX11, libXft, libXi, inputproto, libSM, libICE
+, freetype, pkgconfig, which }:
 
+stdenv.mkDerivation {
   name = "mrxvt-0.5.4";
 
-  buildInputs = [libX11 libXft libXi inputproto libSM libICE
-    freetype pkgconfig which];
+  buildInputs =
+    [ libX11 libXft libXi inputproto libSM libICE freetype pkgconfig which ];
 
-  configureFlags=[
+  configureFlags = [
     "--with-x"
     "--enable-frills"
     "--enable-xft"
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
     "--with-save-lines=10000"
   ];
 
-  preConfigure=''
+  preConfigure = ''
     NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2";
   '';
 
@@ -27,10 +28,10 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-    description = "lightweight multitabbed feature-rich X11 terminal emulator";
+    description = "Lightweight multitabbed feature-rich X11 terminal emulator";
     longDescription = "
     	Multitabbed lightweight terminal emulator based on rxvt. 
-	Supports transparency, backgroundimages, freetype fonts,..
+	Supports transparency, backgroundimages, freetype fonts, ...
     ";
     homepage = http://sourceforge.net/projects/materm;
     license = "GPL";
diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix
index af6bc072e53..8fd04353969 100644
--- a/pkgs/applications/misc/multisync/default.nix
+++ b/pkgs/applications/misc/multisync/default.nix
@@ -1,15 +1,19 @@
-args: with args;
-
+{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig
+, libgnomeui, GConf, automake, autoconf }:
 
 stdenv.mkDerivation {
   name = "multisync-0.82-1";
+  
   src = fetchurl {
     url = mirror://sourceforge/multisync/multisync-0.82-1.tar.bz2;
     sha256 = "1azb6zsn3n1rnla2qc3c440gc4vgmbj593k6xj5g1v0xha2vm2y3";
   };
-  buildInputs = [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
-                  automake autoconf
-                ];
+  
+  buildInputs =
+    [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
+      automake autoconf
+    ];
+    
   preConfigure = "./autogen.sh"; # install.sh is not contained in the tar
 
   meta = {
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 94b68fc6bc9..6d4fa97c8cb 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl }:
+
 stdenv.mkDerivation rec {
   name = "pgadmin3-1.10.0";
 
@@ -7,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1ndi951da3jw5800fjdgkbvl8n6k71x7x16ghihi1l88bilf2a16";
   };
 
-  buildInputs = [postgresql wxGTK libxml2 libxslt openssl];
+  buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];
 
   meta = { 
-      description = "postgresql admin gui tool";
-      homepage = http://www.pgadmin.org;
-      license = "GPL2";
-    };
+    description = "PostgreSQL administration GUI tool";
+    homepage = http://www.pgadmin.org;
+    license = "GPL2";
+  };
 }
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index 1ccbfd41728..15bcc477bdd 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -1,6 +1,7 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
-  name="procmail-3.22";
+  name = "procmail-3.22";
 
   buildInputs = [ stdenv.gcc.libc ];
 
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index 71cac8eefa7..67d3f32d53f 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
   name = "pstree-2.33";
 
@@ -7,15 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg";
   };
 
-  unpackPhase="unpackFile \$src; sourceRoot=.";
+  unpackPhase = "unpackFile \$src; sourceRoot=.";
 
-  buildPhase="pwd; gcc -o pstree pstree.c";
-  installPhase="ensureDir \$out/bin; cp pstree \$out/bin";
+  buildPhase = "pwd; gcc -o pstree pstree.c";
+  installPhase = "ensureDir \$out/bin; cp pstree \$out/bin";
 
   meta = {
-      description = "show the running processes as tree";
-      # don't know the correct homepage..
-      homepage = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.32.tar.gz;
-      license = "GPL";
-    };
+    description = "Show the set of running processes as a tree";
+    license = "GPL";
+  };
 }
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index 00d4fe99ba3..798f9eeec20 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -1,5 +1,7 @@
 # translations still misssing
-args: with args;
+
+{ stdenv, fetchurl, qt3, libpng, libXext, libX11 }:
+
 stdenv.mkDerivation {
   name = "qcad-2.0.5.0-1-community";
 
@@ -15,7 +17,7 @@ stdenv.mkDerivation {
     cd ..
   '';
 
-  buildInputs = [qt3 libpng libXext libX11];
+  buildInputs = [ qt3 libpng libXext libX11 ];
 
   patchPhase = ''
     sed -i 's/-pedantic//' mkspecs/defs.pro
@@ -35,8 +37,8 @@ stdenv.mkDerivation {
   '';
 
   meta = { 
-      description="A 2D CAD package based upon Qt.";
-      homepage = http://www.ribbonsoft.de/qcad.html;
-      license = "GPLv2"; # community edition
+    description = "A 2D CAD package based upon Qt";
+    homepage = http://www.ribbonsoft.de/qcad.html;
+    license = "GPLv2"; # community edition
   };
 }
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index 58366c6aa04..13597f3ee9b 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXt }:
+
 stdenv.mkDerivation {
   name = "rxvt-2.6.4";
 
@@ -10,8 +11,8 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 libXt ];
 
   meta = { 
-      description = "colour vt102 terminal emulator with less features and lower memory consumption";
-      homepage = http://www.rxvt.org/;
-      license = "GPL";
+    description = "Colour vt102 terminal emulator with less features and lower memory consumption";
+    homepage = http://www.rxvt.org/;
+    license = "GPL";
   };
 }
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 74eead5e782..029d8675ddf 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,11 +1,11 @@
-args: with args;
-# args.perlSupport: enables perl interpreter support
-# see man urxvtperl for details
+{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl }:
+
 let 
   name = "rxvt-unicode";
   version = "9.07";
   n = "${name}-${version}";
 in
+
 stdenv.mkDerivation (rec {
 
   name = "${n}${if perlSupport then "-with-perl" else ""}";
@@ -15,26 +15,25 @@ stdenv.mkDerivation (rec {
     sha256 = "18y5mb3cm1gawjm723q5r7yk37s9drzg39kna036i694m2667865";
   };
 
-  buildInputs = [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]
-          ++ lib.optional perlSupport perl;
+  buildInputs =
+    [ libX11 libXt libXft ncurses /* required to build the terminfo file */ ]
+    ++ stdenv.lib.optional perlSupport perl;
 
-  preConfigure=''
-    configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
-    export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
-  ''
-  # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
-  + (if perlSupport then ''
+  preConfigure =
+    ''
+      configureFlags="${if perlSupport then "--enable-perl" else "--disable-perl"}";
+      export TERMINFO=$out/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
+    ''
+    # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
+    + stdenv.lib.optionalString perlSupport ''
       ensureDir $out/lib/perl5
       ln -s $out/{lib/urxvt,lib/perl5/site_perl}
-  '' else "");
-
-  postInstall = ''
-  '';
+    '';
 
   meta = {
-    description = "rxvt-unicode is a clone of the well known terminal emulator rxvt.";
+    description = "A clone of the well-known terminal emulator rxvt";
     longDescription = "
-      you should put this into your .bashrc
+      You should put this into your ~/.bashrc:
       export TERMINFO=~/.nix-profile/share/terminfo
     ";
     homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix
index 6bf28580b35..c14f6080b8c 100644
--- a/pkgs/applications/misc/sbagen/default.nix
+++ b/pkgs/applications/misc/sbagen/default.nix
@@ -1,18 +1,18 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "sbagen-1.4.4";
 
-  buildPhases="buildPhase installPhase";
+  buildPhases = "buildPhase installPhase";
 
-  buildPhase="./mk";
+  buildPhase = "./mk";
 
-  installPhase="
-    ensureDir \$out/{bin,share/sbagen/doc}
-    cp -r --target-directory=\$out/share/sbagen examples scripts river1.ogg river2.ogg
+  installPhase = ''
+    ensureDir $out/{bin,share/sbagen/doc}
+    cp -r --target-directory=$out/share/sbagen examples scripts river1.ogg river2.ogg
     cp sbagen $out/bin
-    cp --target-directory=\$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt
-  
-   ";
+    cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt
+  '';
 
   src = fetchurl {
     url = http://uazu.net/sbagen/sbagen-1.4.4.tgz;
@@ -20,8 +20,8 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-      description = "binaural sound generator";
-      homepage = http://uazu.net/sbagen;
-      license = "GPL";
-    };
+    description = "Binaural sound generator";
+    homepage = http://uazu.net/sbagen;
+    license = "GPL";
+  };
 }
diff --git a/pkgs/applications/misc/semnotes/default.nix b/pkgs/applications/misc/semnotes/default.nix
new file mode 100644
index 00000000000..e994b567cea
--- /dev/null
+++ b/pkgs/applications/misc/semnotes/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, cmake, qt4, kdelibs, soprano, automoc4, phonon }:
+stdenv.mkDerivation {
+  name = "semnotes-0.4.0-1";
+
+  src = fetchurl {
+    url = "mirror://sf/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2";
+    sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m";
+  };
+
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano ];
+
+  meta = with stdenv.lib; {
+    description = "Semantic note-taking tool for KDE based on Nepomuk-KDE";
+    longDescription = ''
+      SemNotes links notes to the data that is available on the user's desktop.
+      The data stored about a note consists of: a title, content, tags, creation
+      and last modification time. The notes and all the information about them
+      are stored as RDF resources in the Nepomuk repository. They are
+      automatically linked to the resources they reference.
+    '';
+    license = "GPL";
+    homepage = http://smile.deri.ie/projects/semn;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index f8c494cb8ed..cb79bf592fe 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, x11, xextproto, libXtst, inputproto, libXi
+, automake, autoconf, sourceFromHead }:
+
 stdenv.mkDerivation {
   name = "synergy-cvs";
 
@@ -10,18 +12,20 @@ stdenv.mkDerivation {
                (fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_23-55-02.tar.gz"; sha256 = "ae16a9b59039a32e383e71397405d7b610de6c6902c03177c2496bac440d3e28"; });
   # END
 
-  buildInputs = [x11 xextproto libXtst inputproto libXi automake autoconf autoconf];
+  buildInputs = [ x11 xextproto libXtst inputproto libXi automake autoconf ];
 
-  preConfigure = "autoreconf; ";
+  preConfigure = "autoreconf";
 
-  patches = [ (fetchurl {
-    url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
-    sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
-  }) ];
+  patches =
+    [ (fetchurl {
+        url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
+        sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
+      })
+    ];
 
-  meta= { 
-      description = "share mouse keyboard and clipboard between computers";
-      homepage = http://synergy2.sourceforge.net;
-      license = "GPL";
+  meta = { 
+    description = "Tool to share the mouse keyboard and the clipboard between computers";
+    homepage = http://synergy2.sourceforge.net;
+    license = "GPL";
   };
 }
diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix
index 553e297cf7f..2faed53b7a5 100644
--- a/pkgs/applications/misc/thinking-rock/default.nix
+++ b/pkgs/applications/misc/thinking-rock/default.nix
@@ -1,8 +1,9 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "thinkingrock-2.2.1-binary";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz;
     sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm";
   };
@@ -28,11 +29,12 @@ args.stdenv.mkDerivation {
     EOF
     chmod +x $out/bin/thinkingrock
   '';
+  
   installPhase = ":";
 
   meta = { 
-      description = "task managing system";
-      homepage = http://www.thinkingrock.com.au/;
-      license = "CDDL"; # Common Development and Distribution License
+    description = "Task management system";
+    homepage = http://www.thinkingrock.com.au/;
+    license = "CDDL"; # Common Development and Distribution License
   };
 }
diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix
index b4279bccbe5..af942529d32 100644
--- a/pkgs/applications/misc/xneur/0.8.nix
+++ b/pkgs/applications/misc/xneur/0.8.nix
@@ -1,26 +1,28 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, pcre, GStreamer, glib, libxml2, aspell
+, imlib2, xorg, xosd }:
 
 stdenv.mkDerivation {
   name = "xneur-0.8.0";
+  
   src = fetchurl {
     url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2;
     sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8";
   };
 
-  buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
-    libXpm imlib2 xosd libXt libXext];
-
-  inherit aspell imlib2 xosd;
+  buildInputs =
+    [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell
+      xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext
+    ];
 
   preConfigure = ''
     sed -e 's/-Werror//' -i configure
-    sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure
-    sed -e 's/for imlib2_dir in/for imlib2_dir in $imlib2 /' -i configure
-    sed -e 's/for xosd_dir in/for xosd_dir in $xosd /' -i configure
+    sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure
+    sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure
+    sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure
   '';
 
   meta = {
-    description = "xneur is the keyboard layout switcher.";
+    description = "Utility for switching between keyboard layouts";
   };
 
 }
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 5a4bdefdea5..e341ae6cd05 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2
+, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk }:
 
 let s = import ./src-for-default.nix; in
 
@@ -9,17 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = s.hash;
   };
 
-  buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
-    libXpm imlib2 xosd libXt libXext libXi libnotify gtk pango
-    cairo];
-
-  inherit aspell imlib2 xosd;
+  buildInputs =
+    [ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo
+      xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
+      gtk pango
+    ];
 
   preConfigure = ''
     sed -e 's/-Werror//' -i configure
-    sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure
-    sed -e 's/for imlib2_dir in/for imlib2_dir in $imlib2 /' -i configure
-    sed -e 's/for xosd_dir in/for xosd_dir in $xosd /' -i configure
+    sed -e 's/for aspell_dir in/for aspell_dir in ${aspell} /' -i configure
+    sed -e 's/for imlib2_dir in/for imlib2_dir in ${imlib2} /' -i configure
+    sed -e 's/for xosd_dir in/for xosd_dir in ${xosd} /' -i configure
 
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
@@ -31,11 +32,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "xneur is the keyboard layout switcher.";
+    description = "Utility for switching between keyboard layouts";
     homepage = http://xneur.ru;
     license = "GPL2+";
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
   };
-
 }
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 9f6a8a59e72..55d6a9c16b0 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -1,16 +1,24 @@
-args: with args;
+{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "xterm-231";
+  
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
     sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr";
   };
-  buildInputs = [libXaw xproto libXt libXext libX11 libSM libICE ncurses
-    freetype pkgconfig libXft luit];
-  configureFlags = "--enable-wide-chars --enable-256-color
-    --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
-    --enable-mini-luit --with-tty-group=tty";
+  
+  buildInputs =
+    [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
+      ncurses freetype pkgconfig xorg.libXft xorg.luit
+    ];
+    
+  configureFlags =
+    ''
+      --enable-wide-chars --enable-256-color
+      --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
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index 4f793b04fc8..2994ca19065 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,9 +1,8 @@
-args: with args;
+{ composableDerivation, fetchurl, lib, qt, openssl, autoconf, automake, pkgconfig }:
 
-let inherit (args.composableDerivation) composableDerivation edf wwf; in
-
-composableDerivation {} ( fixed : {
+let inherit (composableDerivation) edf wwf; in
 
+composableDerivation.composableDerivation {} ( fixed : {
   name = "yate2";
 
   src = fetchurl {
@@ -12,28 +11,29 @@ composableDerivation {} ( fixed : {
   };
 
   # TODO zaptel ? postgres ?
-  buildInputs = [qt openssl autoconf automake pkgconfig];
+  buildInputs = [ qt openssl autoconf automake pkgconfig ];
 
   # /dev/null is used when linking which is a impure path for the wrapper
-  preConfigure = "
-  
-  sed -i 's@,/dev/null@@' configure
-  "; 
+  preConfigure =
+    ''
+      sed -i 's@,/dev/null@@' configure
+    ''; 
 
   # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
-  preBuild = ''
-    export NIX_LDFLAGS="-L$TMP/yate $NIX_LDFLAGS"
-    find . -type f -iname Makefile | xargs sed -i \
-      -e 's@-Wl,--unresolved-symbols=ignore-in-shared-libs@@' \
-      -e 's@-Wl,--retain-symbols-file@@'
-  '';
+  preBuild =
+    ''
+      export NIX_LDFLAGS="-L$TMP/yate $NIX_LDFLAGS"
+      find . -type f -iname Makefile | xargs sed -i \
+        -e 's@-Wl,--unresolved-symbols=ignore-in-shared-libs@@' \
+        -e 's@-Wl,--retain-symbols-file@@'
+    '';
 
   meta = { 
     description = "YATE - Yet Another Telephony Engine";
     homepage = http://yate.null.ro/;
     license = ["GPL" "MPL"]; # Yate's license is GPL with an exception for linking with OpenH323 and PWlib (licensed under MPL).
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 
 } )
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index addeb0dcf11..dbb20dc4fd9 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -27,23 +27,25 @@
 , dbus
 , dbus_glib
 , patchelf
+, cups
+, libgcrypt
 }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
   name = "chrome-${version}";
-  version = "47504";
+  version = "51653";
   src = 
     if stdenv.system == "x86_64-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip";
-        sha256 = "06cwfr02acv9b0sbc14irqx099p4mgyjl9w58g1vja6r7jbb234c";
+        sha256 = "1d8q4ac8s3b1bncli537phzxshfr50j69y49409g5p64v7iya9kw";
       } 
     else if stdenv.system == "i686-linux" then 
       fetchurl {
         url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip";
-        sha256 = "1g9m2d5x415gybjd6kvnhbj2sbfcaszv3dzvdwncsrcviic6w634";
+        sha256 = "1kdhwkl7xxssmkrkkgrdwrwvbah97va7rxbwrfhlcnjgw60ppf9v";
       } 
     else null;
 
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
 
   libPath = 
     stdenv.lib.makeLibraryPath
-       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib] ;
+       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib cups libgcrypt] ;
 
   installPhase = ''
     ensureDir $out/bin
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index c5b9894a796..9fb59fcdb86 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl
+, spidermonkey, guile, gpm }:
 
 stdenv.mkDerivation rec {
   name = "elinks-0.12pre5";
@@ -8,13 +9,17 @@ stdenv.mkDerivation rec {
     sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d";
   };
 
-  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}";
+  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}
+    '';
 
   meta = {
-    description = "Full-Featured Text WWW Browser";
+    description = "Full-featured text-mode web browser";
     homepage = http://elinks.or.cz;
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox/3.5.nix b/pkgs/applications/networking/browsers/firefox/3.5.nix
index e26d9a7456d..a5a35578b13 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.9";
+  firefoxVersion = "3.5.10";
   
-  xulVersion = "1.9.1.9"; # this attribute is used by other packages
+  xulVersion = "1.9.1.10"; # 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 = "f20f06a783ee81ec1d7d6f7a75b38a25dc58f0e1";
+    sha1 = "9e84dee03f003eaf79df12de9d13ac8f6c4cd9b1";
   };
 
 
diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix
index c3f16f72aee..324fcda25ad 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.3";
+  firefoxVersion = "3.6.8";
   
-  xulVersion = "1.9.2.3"; # this attribute is used by other packages
+  xulVersion = "1.9.2.8"; # 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";
-    sha256 = "1l5290l1jrglvih0957iv8xn5sxmqklx67kqqnv059dsg5fv781m";
+    sha1 = "4936e543f6c7492c5954cbd5b30ddda6b20e3797";
   };
 
 
@@ -46,11 +46,15 @@ rec {
     
     inherit src;
 
+    # To be removed when the change gets upstream. I don't know if the patch
+    # affects xulrunner or firefox.
+    patches = [ ./symlinks-bug551152.patch ];
+
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
         python dbus dbus_glib pango freetype fontconfig xlibs.libXi
         xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
-        alsaLib nspr /* nss */ libnotify
+        alsaLib nspr /* nss */ libnotify xlibs.pixman
       ];
 
     configureFlags =
@@ -101,9 +105,14 @@ rec {
 
     inherit src;
 
+    # To be removed when the change gets upstream. I don't know if the patch
+    # affects xulrunner or firefox.
+    patches = [ ./symlinks-bug551152.patch ];
+
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
         dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
+        xlibs.pixman
       ];
 
     propagatedBuildInputs = [xulrunner];
diff --git a/pkgs/applications/networking/browsers/firefox/symlinks-bug551152.patch b/pkgs/applications/networking/browsers/firefox/symlinks-bug551152.patch
new file mode 100644
index 00000000000..c3c1c541fa0
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/symlinks-bug551152.patch
@@ -0,0 +1,139 @@
+The firefox people has not applied this patch along all the 3.6 releases so in 3.6.4 it is still not there.
+https://bugzilla.mozilla.org/show_bug.cgi?id=551152
+https://bugzilla.mozilla.org/attachment.cgi?id=431403
+
+diff --git a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+index 57f6df9..e9909a7 100644
+--- a/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
++++ b/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+@@ -633,10 +633,6 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile)
+             aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), 
+                                         getter_AddRefs(current));
+             NS_ASSERTION(current, "broken search path! bad element");
+-            // nsIFile::Equals basically compares path strings so normalize
+-            // before the comparison.
+-            parent->Normalize();
+-            current->Normalize();
+             PRBool same;
+             if (NS_SUCCEEDED(parent->Equals(current, &same)) && same)
+                 return (int) i;
+diff --git a/xpcom/tests/unit/test_file_equality.js b/xpcom/tests/unit/test_file_equality.js
+index 4f424fe..14ba5a8 100644
+--- a/xpcom/tests/unit/test_file_equality.js
++++ b/xpcom/tests/unit/test_file_equality.js
+@@ -63,7 +63,7 @@ function test_normalized_vs_non_normalized()
+ 
+   // this is a non-normalized version of tmp1, it should not equal tmp1
+   tmp2.appendRelativePath(".");
+-  do_check_false(tmp1.equals(tmp2));
++  do_check_true(tmp1.equals(tmp2));
+ 
+   // normalize and make sure they are equivalent again
+   tmp2.normalize();
+diff --git a/xulrunner/stub/nsXULStub.cpp b/xulrunner/stub/nsXULStub.cpp
+index dc3a592..b270175 100644
+--- a/xulrunner/stub/nsXULStub.cpp
++++ b/xulrunner/stub/nsXULStub.cpp
+@@ -490,14 +490,6 @@ main(int argc, char **argv)
+              range.lower, range.upper);
+       return 1;
+     }
+-#ifdef XP_UNIX
+-    // Using a symlinked greDir will fail during startup. Not sure why, but if
+-    // we resolve the symlink, everything works as expected.
+-    char resolved_greDir[MAXPATHLEN] = "";  
+-    if (realpath(greDir, resolved_greDir) && *resolved_greDir) {
+-      strncpy(greDir, resolved_greDir, MAXPATHLEN);
+-    }
+-#endif
+   }
+ 
+ #ifdef XP_OS2
+diff --git a/xpcom/io/nsLocalFileOSX.mm b/xpcom/io/nsLocalFileOSX.mm
+index bbe2b26..6f51638 100644
+--- a/xpcom/io/nsLocalFileOSX.mm
++++ b/xpcom/io/nsLocalFileOSX.mm
+@@ -1068,6 +1068,9 @@ NS_IMETHODIMP nsLocalFile::Clone(nsIFile **_retval)
+ 
+ NS_IMETHODIMP nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
+ {
++  struct STAT st, inst;
++  PRBool exists = PR_TRUE;
++
+   NS_ENSURE_ARG(inFile);
+   NS_ENSURE_ARG_POINTER(_retval);
+   *_retval = PR_FALSE;
+@@ -1077,7 +1080,27 @@ NS_IMETHODIMP nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
+   if (NS_FAILED(rv))
+     return rv;
+ 
+-  *_retval = !strcmp(mPath, inPath.get());
++  if (STAT(mPath.get(), &st) == -1) {
++    // try lstat it may be a symlink
++    if (LSTAT(mPath.get(), &st) == -1)
++      exists = PR_FALSE;
++  }
++
++  if (exists && (STAT(inPath.get(), &inst) == -1)) {
++    // try lstat it may be a symlink
++    if (LSTAT(inPath.get(), &inst) == -1)
++      exists = PR_FALSE;
++  }
++
++  if (!exists) {
++    // We don't need to worry about "/foo/" vs. "/foo" here
++    // because trailing slashes are stripped on init.
++    *_retval = !strcmp(inPath.get(), mPath.get());
++    return NS_OK;
++  }
++
++  *_retval = (st.st_ino == inst.st_ino) &&
++             (st.st_dev == inst.st_dev);
+   return NS_OK;
+ }
+ 
+diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
+index 289600a..bdf0f81 100644
+--- a/xpcom/io/nsLocalFileUnix.cpp
++++ b/xpcom/io/nsLocalFileUnix.cpp
+@@ -1400,6 +1400,9 @@ nsLocalFile::IsSpecial(PRBool *_retval)
+ NS_IMETHODIMP
+ nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
+ {
++    struct STAT st, inst;
++    PRBool exists = PR_TRUE;
++
+     NS_ENSURE_ARG(inFile);
+     NS_ENSURE_ARG_POINTER(_retval);
+     *_retval = PR_FALSE;
+@@ -1409,9 +1412,27 @@ nsLocalFile::Equals(nsIFile *inFile, PRBool *_retval)
+     if (NS_FAILED(rv))
+         return rv;
+ 
+-    // We don't need to worry about "/foo/" vs. "/foo" here
+-    // because trailing slashes are stripped on init.
+-    *_retval = !strcmp(inPath.get(), mPath.get());
++    if (STAT(mPath.get(), &st) == -1) {
++        // try lstat it may be a symlink
++        if (LSTAT(mPath.get(), &st) == -1)
++            exists = PR_FALSE;
++    }
++
++    if (exists && (STAT(inPath.get(), &inst) == -1)) {
++        // try lstat it may be a symlink
++        if (LSTAT(inPath.get(), &inst) == -1)
++            exists = PR_FALSE;
++    }
++
++    if (!exists) {
++        // We don't need to worry about "/foo/" vs. "/foo" here
++        // because trailing slashes are stripped on init.
++        *_retval = !strcmp(inPath.get(), mPath.get());
++        return NS_OK;
++    }
++
++    *_retval = (st.st_ino == inst.st_ino) &&
++               (st.st_dev == inst.st_dev);
+     return NS_OK;
+ }
+ 
diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index bf0525668c8..fbaf893701e 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
+{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
 , libnotify, gnomevfs, libgnomeui
-, freetype, fontconfig, wirelesstools ? null
+, freetype, fontconfig, wirelesstools ? null, pixman
 , application ? "browser" }:
 
 # Build the WiFi stuff on Linux-based systems.
@@ -9,18 +9,18 @@
 # http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
 #assert stdenv.isLinux -> (wirelesstools != null);
 
-let version = "3.6"; in
+let version = "3.6.7"; in
 stdenv.mkDerivation {
   name = "icecat-${version}";
 
   src = fetchurl {
-    url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
-    sha256 = "0fsf8zd8nncg1w1gg2jhlxwkbljvrx4mm9pywasklyi0gvi939ds";
+    url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
+    sha256 = "0nm0py3kd55pgyx1yv44v1acq5d1rgka3p6msfbgqx60yd38rwsm";
   };
 
   buildInputs =
-    [ libgnomeui libnotify gnomevfs alsaLib
-      pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+    [ xz libgnomeui libnotify gnomevfs alsaLib
+      pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
       python ply dbus dbus_glib pango freetype fontconfig
       xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
     ]
@@ -30,18 +30,6 @@ stdenv.mkDerivation {
     ./skip-gre-registration.patch ./rpath-link.patch
   ];
 
-  postPatch =
-    # Work around the broken `firefox.js' in 3.6.  See
-    # http://news.gmane.org/gmane.comp.gnu.gnuzilla/1419 for details.
-    let firefox_js = fetchurl {
-          url = "http://svn.savannah.gnu.org/viewvc/*checkout*/trunk/icecat/browser/app/profile/firefox.js?revision=98&root=gnuzilla";
-          sha256 = "1jf86wa7r7pf4f3ixrnsslv0i35ypm8hrzlw14hcm5wjcwidzq0f";
-          name = "firefox.js";
-        };
-    in
-      '' cp -v "${firefox_js}" "browser/app/profile/firefox.js"
-      '';
-
   configureFlags =
     [ "--enable-application=${application}"
       "--enable-libxul"
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 8bbe3396c47..e0f4b632c76 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -51,9 +51,9 @@ let
         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";
+        version = "10.1.53.64";
+        url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
+        sha256 = "1598vn4dd96cp1nv225vvjpna70ydkd8lcyfm88gnpzkwx2scz1b";
       }
     else throw "flashplayer is not supported on this platform";
 
diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix
index fc6c5c0013a..60f2162a26a 100644
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ b/pkgs/applications/networking/browsers/rekonq/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl
-, v ? "0.4.90" }:
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, perl
+, gtk, gettext, pixman}:
 
-stdenv.mkDerivation (
-  builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; })
-  // {
-    buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl ];
+stdenv.mkDerivation rec {
+  name = "rekonq-0.5.0";
 
-    meta = with stdenv.lib; {
-      platforms = platforms.linux;
-      maintainers = [ maintainers.urkud ];
-      description = "KDE Webkit browser";
-      homepage = http://rekonq.sourceforge.net;
-    };
-  }
-)
+  src = fetchurl {
+    url = "mirror://sf/rekonq/${name}.tar.bz2";
+    sha256 = "0qm16ivxlh3pj7v39z3ajf90sgm5q5xq6a8s2x1a0ipsh7fgkp58";
+  };
+
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl gtk gettext pixman ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.urkud ];
+    description = "KDE Webkit browser";
+    homepage = http://rekonq.sourceforge.net;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index c23a0009e94..b5093419a26 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -9,7 +9,7 @@ let
   ];
 in
 rec {
-  src = (a.fetchGitFromSrcInfo s) + "/";
+  src = (a.fetchUrlFromSrcInfo s);
   inherit (s) name;
 
   inherit buildInputs;
@@ -19,9 +19,10 @@ rec {
   phaseNames = ["addInputs" "setVars" "doMakeInstall" "doWrap"];
 
   setVars = a.noDepEntry (''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11"
   '');
 
-  doWrap = a.makeManyWrappers "$out/bin/uzbl" 
+  doWrap = a.makeManyWrappers "$out/bin/uzbl-core" 
     ''
       --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
       --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \
diff --git a/pkgs/applications/networking/browsers/uzbl/experimental.nix b/pkgs/applications/networking/browsers/uzbl/experimental.nix
deleted file mode 100644
index 7d467056db8..00000000000
--- a/pkgs/applications/networking/browsers/uzbl/experimental.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-a :  
-let 
-  s = import ./src-for-experimental.nix;
-  buildInputs = with a; [
-    libsoup pkgconfig webkit gtk makeWrapper
-  ];
-in
-rec {
-  src = (a.fetchGitFromSrcInfo s) + "/";
-
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "addInputs" "doMakeInstall" "doWrap"];
-
-  setVars = a.noDepEntry ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
-  '';
-      
-  doWrap = a.makeManyWrappers "$out/bin/uzbl*" 
-    ''
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsBase}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstPluginsGood}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstFfmpeg}/lib/gstreamer-* 
-    '';
-
-  installFlags = "PREFIX=$out";
-
-  meta = {
-    description = "Tiny externally controllable webkit browser";
-    maintainers = [a.lib.maintainers.raskin];
-    platforms = with a.lib.platforms; 
-      linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/uzbl/src-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-for-default.nix
index cb6876bb9ad..2ffc1f95380 100644
--- a/pkgs/applications/networking/browsers/uzbl/src-for-default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/src-for-default.nix
@@ -1,9 +1,10 @@
 rec {
-   version="d2d73ad463f3d9f1c673d37457af159947b3faac";
-   name="uzbl-stable-d2d73ad463f3d9f1c673d37457af159947b3faac";
-   hash="7b162ad46445b4080c0cf2ac57c777186d4a9a58979499fe5556e6e855d4e53c";
-   rev="d2d73ad463f3d9f1c673d37457af159947b3faac";
-   url="git://github.com/Dieterbe/uzbl.git";
+   version="2010.04.03";
+   name="uzbl-stable-2010.04.03";
+   hash="1jxs9agk4jd09v73vl69k3mil4jfr5rhfb0v4sq8sfh1p8nl389s";
+   url="http://github.com/Dieterbe/uzbl/tarball/${version}";
+   advertisedUrl="http://github.com/Dieterbe/uzbl/tarball/2010.04.03";
   
+   downloadName="2010.04.03.tar.gz";
   
 }
diff --git a/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix b/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix
deleted file mode 100644
index 237a56aaa75..00000000000
--- a/pkgs/applications/networking/browsers/uzbl/src-for-experimental.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-rec {
-   version="1461ac760f79b8f153c8317c4534cb047a48331a";
-   name="uzbl-experimental-1461ac760f79b8f153c8317c4534cb047a48331a";
-   hash="b5dfae5245b1b3934ca918831fbe9fa0bb7ae790c682b69f5ecc042cccf58894";
-   rev="1461ac760f79b8f153c8317c4534cb047a48331a";
-   url="git://github.com/Dieterbe/uzbl.git";
-}
diff --git a/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix
index 61ac0e15294..48650efd146 100644
--- a/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix
@@ -1,7 +1,9 @@
 {
-  repoUrl = "git://github.com/Dieterbe/uzbl.git";
   baseName = "uzbl-stable";
-  method = "fetchgit";
-  rev = "origin/master";
+  downloadPage = "http://github.com/Dieterbe/uzbl/downloads";
+  sourceRegexp = "/tarball/";
+  versionExtractorSedScript = ''s@.*[/]@@'';
+  versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
+  extraVars = "downloadName";
+  eval_downloadName = ''downloadName=$version.tar.gz'';
 }
-
diff --git a/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix b/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix
deleted file mode 100644
index 60750f7b90b..00000000000
--- a/pkgs/applications/networking/browsers/uzbl/src-info-for-experimental.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  repoUrl = "git://github.com/Dieterbe/uzbl.git";
-  baseName = "uzbl-experimental";
-  method = "fetchgit";
-  rev = "origin/experimental";
-}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index d842dc9364b..02fbc9643b7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,10 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, pidgin, intltool, libxml2 }:
+
+let version = "1.10.0"; in
 
-let
-  version = "1.10.0";
-in
 stdenv.mkDerivation {
   name = "pidgin-sipe-${version}";
+  
   src = fetchurl {
     url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz";
     sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 04f9e609204..c7c7ec40cce 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -21,10 +21,10 @@
 } :
 
 stdenv.mkDerivation {
-  name = "pidgin-2.7.1";
+  name = "pidgin-2.7.2";
   src = fetchurl {
-    url = mirror://sourceforge/pidgin/pidgin-2.7.1.tar.bz2;
-    sha256 = "1lcmpb86qsknkzwc1395r2aq09v8z6cr7d23jwi57mcs72ksa4pl";
+    url = mirror://sourceforge/pidgin/pidgin-2.7.2.tar.bz2;
+    sha256 = "1h3112548rjkz4gycm2yq9wjfp1jcdk30qcgvckpf6c4yckg3dca";
   };
 
   inherit nss ncurses;
diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index ea0cb9a4ad8..b981c105a0c 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl, unzip }:
 
-stdenv.mkDerivation {
-  name = "chatzilla-0.9.85";
+stdenv.mkDerivation rec {
+  name = "chatzilla-0.9.86";
   
   src = fetchurl {
     # Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
-    url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.85-xr.zip;
-    sha256 = "0jd7mq05715vad82sl4ycr7ga587k53dijxz371y3zwpf8479hqx";
+    url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86-xr.zip;
+    sha256 = "1z8767arx2ncch0pzkdzhisjgmd45qianahz3xr8isvahv2klj5x";
   };
 
-  buildInputs = [unzip];
+  buildInputs = [ unzip ];
 
   buildCommand = ''
     ensureDir $out
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
new file mode 100644
index 00000000000..ca583c52ed1
--- /dev/null
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -0,0 +1,56 @@
+{ monolithic ? true # build monolithic Quassel
+, daemon ? false # build Quassel daemon
+, client ? false # build Quassel client
+, kde ? true # enable KDE integration
+, ssl ? true # enable SSL support
+, previews ? false # enable webpage previews on hovering over URLs
+, stdenv, fetchurl, cmake, qt4, kdelibs ? null, automoc4 ? null, phonon ? null }:
+
+assert kde -> kdelibs != null && automoc4 != null && phonon != null;
+
+let
+  edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
+
+in with stdenv; mkDerivation rec {
+
+  name = "quassel-0.6.1";
+
+  src = fetchurl {
+    url = "http://quassel-irc.org/pub/${name}.tar.bz2";
+    sha256 = "1v5mxligfygn7r7hm3b9by38qxigncfkp6w4n8ypp8ww6n8ml6z0";
+  };
+
+  buildInputs = [ cmake qt4 ]
+    ++ lib.optional kde kdelibs
+    ++ lib.optional kde automoc4
+    ++ lib.optional kde phonon;
+
+  cmakeFlags = [
+    "-DWITH_DBUS=OFF"
+    "-DWITH_LIBINDICATE=OFF"
+    "-DEMBED_DATA=OFF"
+    "-DSTATIC=OFF"
+    "-DWITH_PHONON=ON" ]
+    ++ edf monolithic "WANT_MONO"
+    ++ edf daemon "WANT_CORE"
+    ++ edf client "WANT_QTCLIENT"
+    ++ edf kde "WITH_KDE"
+    ++ edf ssl "WITH_OPENSSL"
+    ++ edf previews "WITH_WEBKIT"  ;
+
+  meta = with stdenv.lib; {
+    homepage = http://quassel-irc.org/;
+    description = "Qt4/KDE4 distributed IRC client suppporting a remote daemon";
+    longDescription = ''
+      Quassel IRC is a cross-platform, distributed IRC client,
+      meaning that one (or multiple) client(s) can attach to
+      and detach from a central core -- much like the popular
+      combination of screen and a text-based IRC client such
+      as WeeChat, but graphical(based on Qt4/KDE4).
+    '';
+    license = "GPLv3";
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/applications/networking/kphone/default.nix b/pkgs/applications/networking/kphone/default.nix
index c631fb35c11..7b1c7c76dd8 100644
--- a/pkgs/applications/networking/kphone/default.nix
+++ b/pkgs/applications/networking/kphone/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, autoconf, automake, libtool, qt, pkgconfig
+, openssl, libpng, alsaLib, libX11, libXext, libXt, libICE
+, libSM }:
 
 stdenv.mkDerivation {
   name = "kphone-1.2";
@@ -10,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ autoconf automake libtool qt pkgconfig openssl libpng alsaLib
-      libX11 libXext libXt libICE libSM libX11
+      libX11 libXext libXt libICE libSM
     ];
     
   preConfigure = "autoconf";
@@ -19,7 +21,7 @@ stdenv.mkDerivation {
     description = "KPhone is a SIP UA for Linux";
     homepage = http://sourceforge.net/projects/kphone/;
     license = "GPL";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 86e6873f4b4..fbc9a08bd68 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -14,16 +14,21 @@ assert saslSupport -> cyrus_sasl != null;
 
 stdenv.mkDerivation {
   name = "mutt-1.5.20";
+  
   src = fetchurl {
     url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz;
     sha256 = "15m7m419r82awx4mr4nam25m0kpg0bs9vw1z4a4mrzvlkl3zqycm";
   };
+
+  patches = [ ./openssl.patch ];
+  
   buildInputs = [
     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"
     # The next allows building mutt without having anything setgid
diff --git a/pkgs/applications/networking/mailreaders/mutt/openssl.patch b/pkgs/applications/networking/mailreaders/mutt/openssl.patch
new file mode 100644
index 00000000000..6476075d67d
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/mutt/openssl.patch
@@ -0,0 +1,15 @@
+Fixes a compilation problem with OpenSSL 1.0.0.
+From http://www.freebsd.org/cgi/query-pr.cgi?pr=146261
+
+diff -ru -x '*~' mutt-1.5.20-orig/mutt_ssl.c mutt-1.5.20/mutt_ssl.c
+--- mutt-1.5.20-orig/mutt_ssl.c	2009-06-10 07:08:29.000000000 +0200
++++ mutt-1.5.20/mutt_ssl.c	2010-07-24 10:46:08.000000000 +0200
+@@ -652,7 +652,7 @@
+   char *buf = NULL;
+   int bufsize;
+   /* needed to get the DNS subjectAltNames: */
+-  STACK *subj_alt_names;
++  STACK_OF(GENERAL_NAME) *subj_alt_names;
+   int subj_alt_names_count;
+   GENERAL_NAME *subj_alt_name;
+   /* did we find a name matching hostname? */
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
index 619c1e44ab4..f6b08ebeb65 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
 , dbus_glib, bzip2, alsaLib, nspr
+, libnotify, cairo, pixman, fontconfig
 
 , # If you want the resulting program to call itself "Thunderbird"
   # instead of "Shredder", enable this option.  However, those
@@ -10,18 +11,21 @@
     
 }:
 
-let version = "3.0.4"; in
+let version = "3.1.1"; 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 = "5a6e89096da61a520e5cecb61f8afeb981f90412";
+    sha1 = "8e25fd786fbe094c3f4d9bc4e18285701bd42279";
   };
 
   buildInputs =
-    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr ];
+    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify
+      libnotify cairo pixman fontconfig ];
+
+  NIX_LDFLAGS = "-lpixman-1";
 
   configureFlags =
     [ "--enable-application=mail"
@@ -34,6 +38,7 @@ stdenv.mkDerivation {
       "--with-system-nspr"
       "--enable-system-cairo"
       "--disable-crashreporter"
+      "--disable-necko-wifi"
       "--disable-tests"
       "--enable-static" # required by `make install'
     ]
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 9df7868be1b..299accef4e5 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A GTK+-based Usenet newsreader good at both text and binaries";
     homepage = http://pan.rebelbase.com/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix
index 52491aa29fb..79e7601e46e 100644
--- a/pkgs/applications/networking/p2p/ldcpp/1.0.3.nix
+++ b/pkgs/applications/networking/p2p/ldcpp/default.nix
@@ -1,4 +1,6 @@
-args : with args; with builderDefs;
+{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11 }:
+
+with builderDefs;
 	let localDefs = builderDefs.passthru.function ((rec {
 		src = /* put a fetchurl here */
 		fetchurl {
@@ -6,7 +8,7 @@ args : with args; with builderDefs;
 			sha256 = "0w9c8k13cl85y4v4av8ic6w4zkdivcj6p5q86llfh3sz077vckiv";
 		};
 
-		buildInputs = [scons pkgconfig gtk bzip2 pkgconfig libglade
+		buildInputs = [scons pkgconfig gtk bzip2 libglade
 			openssl libX11];
 		configureFlags = [];
 		doScons = fullDepEntry (''
@@ -15,7 +17,7 @@ args : with args; with builderDefs;
 			scons PREFIX=$out 
 			scons PREFIX=$out install
 		'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
-	}) //  args);
+	}));
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "ldcpp-1.0.3";
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index dfe79bff15e..6bc6dce38f8 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }:
 
 stdenv.mkDerivation (rec {
-  name = "mldonkey-3.0.1";
+  name = "mldonkey-3.0.2";
   
   src = fetchurl {
     url = "mirror://sourceforge/mldonkey/${name}.tar.bz2";
-    sha256 = "09zk53rfdkjipf5sl37rypzi2mx0a5v57vsndj22zajkqr4l0zds";
+    sha256 = "0l1gcgsn603l2lv5jxjjr44r7kq2hpfcy98w3y2gf5n9d4fhja84";
   };
   
   meta = {
diff --git a/pkgs/applications/networking/twinkle/default.nix b/pkgs/applications/networking/twinkle/default.nix
index 04141a51984..905f7efc43a 100644
--- a/pkgs/applications/networking/twinkle/default.nix
+++ b/pkgs/applications/networking/twinkle/default.nix
@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost
+, libsndfile, libxml2, libjpeg, readline, qt, perl, file
+, alsaLib, speex, libzrtpcpp, xorg }:
+        
 stdenv.mkDerivation {
   name = "twinkle-1.4.2";
 
@@ -9,19 +12,18 @@ stdenv.mkDerivation {
 
   configureFlags = "--with-extra-includes=${libjpeg}/include";
 
-  buildInputs = [pkgconfig commoncpp2 ccrtp openssl boost libsndfile
-    libxml2 libjpeg readline qt libjpeg perl file
-    # optional ? :
-    alsaLib
-    speex libzrtpcpp libX11 libXaw libICE libXext
+  buildInputs =
+    [ pkgconfig commoncpp2 ccrtp openssl boost libsndfile
+      libxml2 libjpeg readline qt perl file
+      # optional ? :
+      alsaLib
+      speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
     ];
 
-
   meta = { 
-    description = "softphone for your voice over IP";
     homepage = http://www.xs4all.nl/~mfnboer/twinkle/index.html;
     license = "GPL";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index e3feb6d34a0..6e3d57b78a8 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -1,15 +1,17 @@
-{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi, libpng, popt, libgsf,
-enchant, wv, librsvg, bzip2
+{ stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi
+, libpng, popt, libgsf, enchant, wv, librsvg, bzip2
 }:
 
 stdenv.mkDerivation {
-  name = "abiword-2.8.5";
+  name = "abiword-2.8.6";
+  
   src = fetchurl {
-    url = http://www.abisource.org/downloads/abiword/2.8.5/source/abiword-2.8.5.tar.gz;
-    sha256 = "0k82y1wd2lx4ifk8rbifbr301zqnrbx61b7x78b14n4k8x13srxa";
+    url = http://www.abisource.org/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz;
+    sha256 = "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r";
   };
 
-  buildInputs = [pkgconfig gtk libglade librsvg bzip2
-                 libgnomecanvas fribidi libpng popt libgsf enchant wv
-                ];
+  buildInputs =
+    [ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
+      libgsf enchant wv
+    ];
 }
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index cefc517f1e8..cfea3a2cb4e 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,7 +2,7 @@
 
 let
    download_root = "http://homebank.free.fr/public/";
-   name = "homebank-4.2.1";
+   name = "homebank-4.3";
    lastrelease = download_root + name + ".tar.gz";
    oldrelease = download_root + "old/" + name + ".tar.gz";
 in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     urls = [ lastrelease oldrelease ];
-    sha256 = "13xz9k55mw14fnp8cf3ypnl6im5dyfbial75wr6i7ikxxpahd00g";
+    sha256 = "1r4bvyc2wnizjjc27hap6b4b01zjfp1x0rygylvi5n29jy6r2fn6";
   };
 
   buildInputs = [ pkgconfig gtk libofx intltool ];
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index 93f8fd79fb1..8123f8717a8 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2
+, libart_lgpl, qt, python, cups, fontconfig, libjpeg
+, zlib, libpng, xorg, cairo, cmake }:
 
 assert stdenv.gcc.gcc != null;
 
@@ -8,13 +10,9 @@ 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 = false;
-
-in
+let useCairo = false; in
 
 stdenv.mkDerivation {
-
   name = "scribus-1.3.3.14";
 
   src = fetchurl {
@@ -35,9 +33,9 @@ stdenv.mkDerivation {
   buildInputs =
     [ pkgconfig /*<- required fro cairo only?*/ cmake freetype lcms libtiff libxml2 libart_lgpl qt
       python cups fontconfig
-      libXaw libXext libX11 libXtst libXi libXinerama
-      libjpeg libtiff zlib libpng
-    ] ++ lib.optional useCairo cairo;
+      xorg.libXaw xorg.libXext xorg.libX11 xorg.libXtst xorg.libXi xorg.libXinerama
+      libjpeg zlib libpng
+    ] ++ stdenv.lib.optional useCairo cairo;
 
   # fix rpath which is removed by cmake..
   postFixup = ''
@@ -49,9 +47,9 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    maintainers = [lib.maintainers.marcweber];
-    platforms = lib.platforms.linux;
-    description = "Desktop Publishing (DTP) and Layout program for Linux.";
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
+    description = "Desktop Publishing (DTP) and Layout program for Linux";
     homepage = http://www.scribus.net;
     license = "GPLv2";
   };
diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix
index 4a732e7750c..4543fce4816 100644
--- a/pkgs/applications/science/biology/arb/default.nix
+++ b/pkgs/applications/science/biology/arb/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, glew, mesa, libpng, lesstif, lynx, freeglut
+, libtiff, rxp, sablotron, perl, jdk, transfig, gv, gnuplot, xorg }:
 
 # NOTE: This package does not build on 64-bit systems. Because of some faulty
 # int->pointer arithmatic. The build scripts are abnormal - but it appears to
@@ -6,6 +7,7 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "arb-2007-Dec-07";
+  
   src = fetchurl {
     url = http://download.arb-home.de/release/2007_12_07/arbsrc.tgz;
     sha256 = "04l7qj0wigg1h56a9d70hxhdr343v3dg5dhqrc7fahc1v4h8f1rd";
@@ -13,7 +15,11 @@ stdenv.mkDerivation {
 
   patches = [ ./makefile.patch ];
 
-  buildInputs = [ glew mesa libpng libXpm lesstif lynx freeglut libtiff rxp sablotron libXaw perl jdk transfig libX11 libXext libXt gv gnuplot ];
+  buildInputs =
+    [ glew mesa libpng xorg.libXpm lesstif lynx freeglut libtiff rxp
+      sablotron xorg.libXaw perl jdk transfig xorg.libX11 xorg.libXext
+      xorg.libXt gv gnuplot
+    ];
 
   unpackPhase = ''
     tar xzf $src
@@ -49,20 +55,22 @@ stdenv.mkDerivation {
     chmod a+rwx $shareddir/lib/pixmaps
     # bulk copy
     cp -vau * $out
+    
     # replace arb script
     mv $out/bin/arb $out/bin/arb.orig
     cat > $out/bin/arb << ARB 
-#!/bin/sh
+    #!/bin/sh
 
-echo Starting Nix compiled arb from $out
-echo Shared databases are located in $shareddir
-# sometimes local profiles override these:
-export ARBHOME=$out
-export LD_LIBRARY=$ARBHOME/lib   
+    echo Starting Nix compiled arb from $out
+    echo Shared databases are located in $shareddir
+    # sometimes local profiles override these:
+    export ARBHOME=$out
+    export LD_LIBRARY=$ARBHOME/lib   
 
-$out/bin/arb_ntree $*
+    $out/bin/arb_ntree $*
 
-ARB
+    ARB
+    
     chmod +x $out/bin/arb
   '';
 
diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index c172075f11f..c7ddceb6b87 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,17 +1,22 @@
-args:
-args.stdenv.mkDerivation {
-  name = "ng-spice-rework-15c";
+{stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
 
-  src = args.fetchurl {
-    url = mirror://sourceforge/ngspice/ng-spice-rework-15c.tar.gz;
-    sha256 = "0v0pbdc54ra0s98dz6mhj80n333ggbn4xpf53vi66sd02hcjblmg";
+stdenv.mkDerivation {
+  name = "ng-spice-rework-21";
+
+  src = fetchurl {
+    url = mirror://sourceforge/ngspice/ng-spice-rework-21.tar.gz;
+    sha256 = "1hmvfl33dszy8xgbixx0zmiz4rdzjhl7lwlwm953jibd4dgx42j5";
   };
 
-  buildInputs =(with args; [readline]);
+  buildInputs = [ readline libX11 bison libICE libXaw libXext ];
+
+  configureFlags = [ "--enable-x" "--with-x" "--with-readline" ];
 
   meta = {
-      description = "The Next Generation Spice (Electronic Circuit Simulator).";
-      homepage = http://ngspice.sourceforge.net;
-      license = ["BSD" "GPLv2"];
+    description = "The Next Generation Spice (Electronic Circuit Simulator).";
+    homepage = http://ngspice.sourceforge.net;
+    license = ["BSD" "GPLv2"];
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
new file mode 100644
index 00000000000..ee2e276c6ca
--- /dev/null
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -0,0 +1,49 @@
+x@{builderDefsPackage, 
+  wxGTK, perl, python, zlib
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  s = import ./src-for-default.nix;
+  helperArgNames = ["builderDefsPackage"] ++ 
+    [];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["setVars" "doMake" "doDeploy"];
+  setVars = a.noDepEntry ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)"
+    pythonLib="$(echo "${python}"/lib/libpython*.so)"
+    pythonLib="''${pythonLib##*/lib}"
+    pythonLib="''${pythonLib%%.so}"
+    export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
+    echo "Flags: $NIX_LDFLAGS"
+  '';
+  goSrcDir = ''cd */'';
+  makeFlags = [
+    "-f makefile-gtk"
+    ];
+  doDeploy = a.fullDepEntry ''
+    cat < ${./make-install.make}  >> makefile-gtk
+    make -f makefile-gtk out="$out" install
+  '' ["minInit" "doMake" "defEnsureDir"];
+      
+  meta = {
+    description = "Cellular automata simulation program";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = "GPLv2";
+  };
+}) x
+
diff --git a/pkgs/applications/science/misc/golly/make-install.make b/pkgs/applications/science/misc/golly/make-install.make
new file mode 100644
index 00000000000..1d082e2b6ce
--- /dev/null
+++ b/pkgs/applications/science/misc/golly/make-install.make
@@ -0,0 +1,9 @@
+
+install_file = echo "\#! /bin/sh" > "$(out)/bin/$(binfile)"; echo "$(out)/share/golly/$(binfile)" >> "$(out)/bin/$(binfile)"; chmod a+x "$(out)/bin/$(binfile)";
+
+install:
+	mkdir -p "$(out)/share/golly"
+	mkdir -p "$(out)/bin"
+	cp -r $(BINFILES) $(SHAREDFILES) "$(out)/share/golly"
+	$(foreach binfile,$(BINFILES),$(install_file))
+
diff --git a/pkgs/applications/science/misc/golly/src-for-default.nix b/pkgs/applications/science/misc/golly/src-for-default.nix
new file mode 100644
index 00000000000..f60df2da315
--- /dev/null
+++ b/pkgs/applications/science/misc/golly/src-for-default.nix
@@ -0,0 +1,9 @@
+rec {
+   version="2.1-src";
+   name="golly-2.1-src";
+   hash="0m9sz0b7pwsxpgvscdvab2q8qnncr337gg3anzgzw83z5zyn3rdz";
+   url="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";
+   advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";
+  
+  
+}
diff --git a/pkgs/applications/science/misc/golly/src-info-for-default.nix b/pkgs/applications/science/misc/golly/src-info-for-default.nix
new file mode 100644
index 00000000000..c3bbb262a6f
--- /dev/null
+++ b/pkgs/applications/science/misc/golly/src-info-for-default.nix
@@ -0,0 +1,4 @@
+{
+  downloadPage = "http://sourceforge.net/projects/golly/files/";
+  method="fetchSF";
+}
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
new file mode 100644
index 00000000000..10d5798b331
--- /dev/null
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -0,0 +1,62 @@
+{ fetchurl, stdenv, cmake, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "simgrid-3.4.1";
+
+  src = fetchurl {
+    url = "https://gforge.inria.fr/frs/download.php/26944/${name}.tar.bz2";
+    sha256 = "acd2bb2c1abf59e9b190279b1c38582b7c1edd4b6ef4c6a9b01100740f1a6b28";
+  };
+
+  /* FIXME: Ruby currently disabled because of this:
+
+     Linking C shared library ../src/.libs/libsimgrid.so
+     ld: cannot find -lruby-1.8.7-p72
+
+   */
+  buildInputs = [ cmake /* ruby */ ];
+
+  preConfigure =
+    # Make it so that libsimgrid.so will be found when running programs from
+    # the build dir.
+    '' export LD_LIBRARY_PATH="$PWD/src/.libs"
+       export cmakeFlags="-Dprefix=$out"
+
+       # Enable tracing.
+       export cmakeFlags="$cmakeFlags -Denable_tracing=on"
+    '';
+
+  makeFlags = "VERBOSE=1";
+
+  patchPhase =
+    '' for i in "src/smpi/"*
+       do
+         sed -i "$i" -e's|/bin/bash|/bin/sh|g'
+       done
+    '';
+
+  installPhase = "make install-simgrid";
+
+  # Fixing the few tests that fail is left as an exercise to the reader.
+  doCheck = false;
+
+  meta = {
+    description = "SimGrid, a simulator for distributed applications in heterogeneous environments";
+
+    longDescription =
+      '' SimGrid is a toolkit that provides core functionalities for the
+         simulation of distributed applications in heterogeneous distributed
+         environments.  The specific goal of the project is to facilitate
+         research in the area of distributed and parallel application
+         scheduling on distributed computing platforms ranging from simple
+         network of workstations to Computational Grids.
+      '';
+
+    homepage = http://simgrid.gforge.inria.fr/;
+
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/applications/science/misc/tulip/configure-opengl.patch b/pkgs/applications/science/misc/tulip/configure-opengl.patch
new file mode 100644
index 00000000000..e5346ef0728
--- /dev/null
+++ b/pkgs/applications/science/misc/tulip/configure-opengl.patch
@@ -0,0 +1,75 @@
+Remove broken detection of OpenGL and GLEW.  See
+<http://sourceforge.net/tracker/?func=detail&aid=3015936&group_id=61223&atid=496518>.
+
+--- tulip-3.3.1/acinclude.m4	2010-01-18 20:34:02.000000000 +0100
++++ tulip-3.3.1/acinclude.m4	2010-06-14 16:25:25.000000000 +0200
+@@ -353,68 +353,8 @@ AC_ARG_WITH(gl-libraries,
+     [  ac_gl_libraries="$withval"
+     ])
+ 
+-AC_CACHE_VAL(ac_cv_have_gl,
+-[
+-if test ${VAR_WIN32} = 1
+-then
+-gl_incdirs=" /mingw/include $ac_gl_includes $GLDIR/include /usr/include /usr/X11R6/include/X11 /usr/X11R6/include $x_includes "
+-else
+-gl_incdirs=" $ac_gl_includes $GLDIR/include /usr/include /usr/X11R6/include/X11 /usr/X11R6/include $x_includes "
+-fi
+-AC_FIND_FILE(GL/gl.h, $gl_incdirs, gl_incdir)
+-ac_gl_includes="$gl_incdir"
+-
+-if test ${VAR_WIN32} = 1
+-then
+-gl_libdirs="$GLDIR $ac_gl_libraries $GLLIB /usr/X11R6/lib /usr/lib /usr/local/lib $x_libraries "
+-else
+-gl_libdirs="$ac_gl_libraries $GLLIB /usr/X11R6/lib64 /usr/lib64 /usr/local/lib64/usr/X11R6/lib /usr/lib /usr/local/lib $x_libraries "
+-fi
+-
+-test -n "$GLDIR" && gl_libdirs="$GLDIR/lib64 $GLDIR/lib $GLDIR $gl_libdirs"
+-test=NONE
+-gl_libdir=NONE
+-for dir in $gl_libdirs; do
+-if test ${VAR_WIN32} = 1
+-then
+-  try="ls -1 $dir/*opengl*"
+-else
+-  try="ls -1 $dir/libGL*"
+-fi
+-  if test=`eval $try 2> /dev/null`; then 
+-    gl_libdir=$dir
+-    if test ${VAR_WIN32} = 0 ; then 	 
+-      try="ls -1 $gl_libdir/libGLEW.*" 	 
+-      if test=`eval $try 2> /dev/null`; then break; else AC_MSG_ERROR([ libGLEW not found , please install it in $gl_libdir ]); fi 	 
+-    else 	 
+-      break 	 
+-    fi
+-  else 
+-    echo "tried $dir" >&AC_FD_CC
+-  fi
+-done
+-ac_gl_libraries="$gl_libdir"
+ ])
+ 
+-eval "$ac_cv_have_gl"
+-if test "$ac_gl_libraries" = NONE; then
+-  AC_MSG_ERROR([ Not found , put your GLDIR environnement variable to the OpenGL directory ]);
+-else
+-  ac_cv_have_gl="have_gl=yes \
+-  ac_gl_includes=$ac_gl_includes ac_gl_libraries=$ac_gl_libraries"
+-  AC_MSG_RESULT([ libraries $ac_gl_libraries, headers $ac_gl_includes ])  
+-  gl_libraries="$ac_gl_libraries"
+-  gl_includes="$ac_gl_includes"
+-if test ${VAR_MACOSX} = 1
+-then
+-  GL_INCLUDES="-I$ac_gl_includes"
+-  GL_LDFLAGS=""
+-else
+-  GL_INCLUDES="-I$ac_gl_includes"	
+-  GL_LDFLAGS="-L$ac_gl_libraries"
+-fi
+-fi
+-
+ dnl MAC PORT
+ if test ${VAR_MACOSX} = 1
+ then
+
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
new file mode 100644
index 00000000000..3bca42023e9
--- /dev/null
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -0,0 +1,50 @@
+{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt
+, autoconf, automake, libtool }:
+
+let version = "3.4.0"; in
+stdenv.mkDerivation rec {
+  name = "tulip-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/auber/tulip/tulip-${version}/${name}.tar.bz2";
+    sha256 = "2889113f773ba539472d501fb4f45dbf5eb76e02c949dfa74c63f6f815a2baab";
+  };
+
+  patches = [ ./configure-opengl.patch ];
+
+  preConfigure =
+    '' export CPATH="${mesa}/include:${glew}/include"
+       export LIBRARY_PATH="${mesa}/lib:${glew}/lib"
+       export QTDIR="${qt}"
+       export LDFLAGS="-lGLEW"
+
+       rm -vf aclocal.m4 ltmain.sh
+       autoreconf -fi
+    '';
+
+  buildInputs = [ libxml2 freetype glew ]
+    ++ [ autoconf automake libtool ];
+  propagagedBuildInputs = [ mesa qt ];
+
+  # FIXME: "make check" needs Docbook's DTD 4.4, among other things.
+  doCheck = false;
+
+  meta = {
+    description = "Tulip, a visualization framework for the analysis and visualization of relational data";
+
+    longDescription =
+      '' Tulip is an information visualization framework dedicated to the
+         analysis and visualization of relational data.  Tulip aims to
+         provide the developer with a complete library, supporting the design
+         of interactive information visualization applications for relational
+         data that can be tailored to the problems he or she is addressing.
+      '';
+
+    homepage = http://tulip.labri.fr/;
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
new file mode 100644
index 00000000000..24060c277fd
--- /dev/null
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -0,0 +1,48 @@
+{ fetchsvn, stdenv, cmake, qt, mesa }:
+
+# ViTE 1.1 has several bugs, so use the SVN version.
+let
+  rev = "1143";
+  externals = fetchsvn {
+    url = "svn://scm.gforge.inria.fr/svn/vite/externals";
+    sha256 = "0wg3yh5q8gx7189rvkd8achld7bzp0i7qqn6c77pg767b4b8dh1a";
+    inherit rev;
+  };
+in
+stdenv.mkDerivation {
+  name = "vite-1.2pre${rev}";
+
+  src = fetchsvn {
+    url = "svn://scm.gforge.inria.fr/svn/vite/trunk";
+    sha256 = "0cy9b6isiwqwnv9gk0cg97x370fpwyccljadds4a118k5gh58zw4";
+    inherit rev;
+  };
+
+  preConfigure =
+    '' rm -v externals
+       ln -sv "${externals}" externals
+    '';
+
+  patches = [ ./larger-line-buffer.patch ];
+
+  buildInputs = [ cmake qt mesa ];
+
+  NIX_LDFLAGS = "-lGLU";
+
+  meta = {
+    description = "Visual Trace Explorer (ViTE), a tool to visualize execution traces";
+
+    longDescription =
+      '' ViTE is a trace explorer. It is a tool to visualize execution traces
+         in Pajé or OTF format for debugging and profiling parallel or
+         distributed applications.
+      '';
+
+    homepage = http://vite.gforge.inria.fr/;
+
+    license = "CeCILL-A";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/applications/science/misc/vite/larger-line-buffer.patch b/pkgs/applications/science/misc/vite/larger-line-buffer.patch
new file mode 100644
index 00000000000..7934c0085c1
--- /dev/null
+++ b/pkgs/applications/science/misc/vite/larger-line-buffer.patch
@@ -0,0 +1,14 @@
+ViTE has an arbitrary restriction on the length of lines read by the parser.
+Make it larger.
+
+--- a/src/parser/PajeFileManager.hpp
++++ b/src/parser/PajeFileManager.hpp
+@@ -67,7 +67,7 @@
+  
+ #include <string.h>
+ 
+-#define _PAJE_BUFSIZE  256
++#define _PAJE_BUFSIZE  16384
+ #define _PAJE_NBMAXTKS  16
+ 
+ /**
diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix
index 763a84fab9f..350b842a095 100644
--- a/pkgs/applications/version-management/arch/default.nix
+++ b/pkgs/applications/version-management/arch/default.nix
@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, which, diffutils, gnupatch, gnutar }:
 
 stdenv.mkDerivation rec {
   name = "tla-1.3.5";
+  
   src = fetchurl {
     url = "mirror://gnu/gnu-arch/" + name + ".tar.gz";
     sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0";
@@ -10,6 +11,7 @@ stdenv.mkDerivation rec {
   patches = [ ./configure-tmpdir.patch ];
 
   buildInputs = [which];
+  
   propagatedBuildInputs = [diffutils gnupatch gnutar];
 
   # Instead of GNU Autoconf, tla uses Tom Lord's now
diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix
index c399c523f89..a5cd1f5a168 100644
--- a/pkgs/applications/version-management/darcs/darcs-2.nix
+++ b/pkgs/applications/version-management/darcs/darcs-2.nix
@@ -3,8 +3,8 @@
 cabal.mkDerivation (self : {
   pname = "darcs";
   name = self.fname;
-  version = "2.4.1";
-  sha256 = "6ac0e84d2eca160e6e33755679dfb185d9b5f9f5bdc43f99db326210aabbc4aa";
+  version = "2.4.4";
+  sha256 = "97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e";
 
   extraBuildInputs = [
     html parsec regexCompat curl haskeline hashedStorage zlib
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 76d4234448c..b9f6ec941b4 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, zlib, openssl}:
 
 let
-  version = "20100521162104";
+  version = "20100703153359";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz";
-    sha256 = "0aym6r06194nnl5801lhihvjc9mhj7zl602xsz7dch8bnhln470f";
+    sha256 = "1n4jl2xcwd8gfp0c897id13myk8z2h0yvs7g7z4s6bywx5wbkx0r";
   };
 
   buildInputs = [ zlib openssl ];
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 054dd0c1813..bc5af2f37c7 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,7 +1,9 @@
-args: with args;
+{ stdenv, fetchurl, python, makeWrapper
+, guiSupport ? false, tk ? null }:
 
 stdenv.mkDerivation rec {
   name = "mercurial-1.5.1";
+  
   src = fetchurl {
     url = "http://www.selenic.com/mercurial/release/${name}.tar.gz";
     sha256 = "5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569";
@@ -10,8 +12,10 @@ stdenv.mkDerivation rec {
   inherit python; # pass it so that the same version can be used in hg2git
 
   buildInputs = [ python makeWrapper ];
+  
   makeFlags = "PREFIX=$(out)";
-  postInstall = (if args.guiSupport then
+  
+  postInstall = (stdenv.lib.optionalString guiSupport
     ''
       ensureDir $out/etc/mercurial
       cp contrib/hgk $out/bin
@@ -23,9 +27,7 @@ stdenv.mkDerivation rec {
       WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
                 --set HG \"$out/bin/hg\"
                 --prefix PATH : \"${tk}/bin\" "
-    ''
-    else "")
-    +
+    '') +
     ''
       for i in $(cd $out/bin && ls); do
         wrapProgram $out/bin/$i \
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index b8b06e66102..e0d462fad29 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.47";
+  version = "0.48";
 in stdenv.mkDerivation rec {
   name = "monotone-${version}";
   inherit perl;
   src = fetchurl {
     url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz";
-    sha256 = "7a99f1a5e4eb2bb7bf82794ab7fc61435fbc55826b710243243c52f7b10be51b";
+    sha256 = "3149abf0e4433a0e14c5da805a04dbbc45b16086bc267d473b17e933407d839d";
   };
   buildInputs = [boost zlib botan libidn lua pcre sqlite];
   preConfigure = ''
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index da7e72669c6..fc0638b62e4 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.6.11";
+  version = "1.6.12";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
-    sha256 = "177565kvn9kq3i8xrvh86cwl7098v2ymhmvjq11x6w04wc501gb4";
+    sha1 = "b4ae7c75abbbdade8b2c9122ca7e2e26c6468a82";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]
diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix
new file mode 100644
index 00000000000..7784fc43913
--- /dev/null
+++ b/pkgs/applications/video/bangarang/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, kdemultimedia, taglib, glibc, gettext }:
+stdenv.mkDerivation rec {
+  name = "bangarang-1.0.1";
+
+  src = fetchurl {
+    url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz";
+    sha256 = "0a89w6zqyzcb34vp3qmyp1mdm2k0igm71b5sh11xnikjvs3k7c33";
+  };
+
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano kdemultimedia taglib glibc gettext ];
+
+  meta = with stdenv.lib; {
+    description = "A media player for KDE based on Nepomuk and Phonon";
+    longDescription = ''
+      Bangarang offers a minimalistic media center user interface,
+      media collection management, playlists and statistics.
+    '';
+    homepage = http://bangarangkde.wordpress.com/;
+    license = "GPLv3";
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index 7d8b2dca272..58a84d91b83 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -1,6 +1,11 @@
-args:
-with args;
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, sourceFromHead, autoconf, automake, libtool
+, pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
+, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
+, libtiff, freetype, mjpegtools, x264, gettext, openexr, esound 
+, libXxf86vm, libXv, libXi, libX11, xextproto, libtheora, libpng
+, libdv, nasm, perl, e2fsprogs }:
+        
+stdenv.mkDerivation {
   name = "cinelerra-git";
 
   # REGION AUTO UPDATE:    { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }
@@ -8,35 +13,33 @@ args.stdenv.mkDerivation {
                (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; });
   # END
 
-  perl = args.perl;
-
   # touch confi.rpath: work around bug in automake 1.10 ?
   preConfigure = ''
-    find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@$perl/bin/perl@" -i
+    find -type f -print0 | xargs --null sed -e "s@/usr/bin/perl@${perl}/bin/perl@" -i
     touch config.rpath
     ./autogen.sh
-    '';
-  configureOptions = ["--enable-freetype2"];
+  '';
+  
+  configureFlags = [ "--enable-freetype2" ];
 
-  buildInputs =(with args; [
-      automake
+  buildInputs =
+    [ automake
       autoconf libtool pkgconfig
       faad2 faac
       a52dec alsaLib   fftw lame libavc1394 libiec61883
       libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
       mjpegtools x264 gettext openexr esound 
-      #
       libXxf86vm libXv libXi libX11 xextproto
       libtheora libpng libdv
       nasm
       perl
       e2fsprogs
-  ]);
+    ];
 
   meta = { 
-      description = "Cinelerra - Video Editor";
-      homepage = http://www.cinelerra.org;
-      maintainers = [lib.maintainers.marcweber];
-      license = "GPLv2";
+    description = "Cinelerra - Video Editor";
+    homepage = http://www.cinelerra.org;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix
index 45737effcce..8c64721bc7e 100644
--- a/pkgs/applications/video/dvdauthor/default.nix
+++ b/pkgs/applications/video/dvdauthor/default.nix
@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng }:
+
+stdenv.mkDerivation {
   name = "dvdauthor-0.6.14";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/dvdauthor/dvdauthor-0.6.14.tar.gz;
     sha256 = "1x4flj3ja7m8rbc956a6ha3qk0k6zxd1y6sl826r6r7dyc91a6yx";
   };
 
-  buildInputs =(with args; [imagemagick libdvdread libxml2 freetype fribidi libpng]);
+  buildInputs = [ imagemagick libdvdread libxml2 freetype fribidi libpng ];
 
   meta = { 
-      description = "Tools for generating DVD files to be played on standalone DVD players";
-      homepage = http://dvdauthor.sourceforge.net/;
-      license = ["GPLv2"];
+    description = "Tools for generating DVD files to be played on standalone DVD players";
+    homepage = http://dvdauthor.sourceforge.net/;
+    license = ["GPLv2"];
   };
 }
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 89ec101610c..21a2313ce16 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,24 +1,33 @@
 { stdenv, fetchurl, perl, xlibs, libdvdnav
 , zlib, a52dec, libmad, faad2, ffmpeg, alsa
 , pkgconfig, dbus, hal, fribidi, qt4, freefont_ttf
-, libvorbis, libtheora, speex
+, libvorbis, libtheora, speex, lua, libgcrypt, libupnp
 }:
 
 stdenv.mkDerivation {
-  name = "vlc-1.0.6";
+  name = "vlc-1.1.0";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/videolan/vlc/1.0.6/vlc-1.0.6.tar.bz2;
-    sha256 = "0hhqbr0hwm07pimdy4rfmf3k3d6iz6icmrndirnp888hg8z968gm";
+    url = http://download.videolan.org/pub/videolan/vlc/1.1.0/vlc-1.1.0.tar.bz2;
+    sha256 = "1j7icg7a2lr99kpc3sjjdp3z7128y6afnvxsafxlnih0qif2ryx9";
   };
 
   buildInputs = [
     perl xlibs.xlibs xlibs.libXv zlib a52dec libmad faad2 ffmpeg
     alsa libdvdnav libdvdnav.libdvdread pkgconfig dbus hal fribidi qt4
-    libvorbis libtheora speex
+    libvorbis libtheora speex lua libgcrypt libupnp
   ];
 
-  configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad --enable-theora --enable-vorbis --enable-speex";
+  configureFlags = [ "--enable-alsa"
+    "--disable-glx"
+    "--disable-remoteosd"
+    "--enable-faad"
+    "--enable-theora"
+    "--enable-vorbis"
+    "--enable-speex"
+    "--disable-dbus"
+    "--disable-dbus-control"
+  ];
 
   preBuild = ''
     substituteInPlace modules/misc/freetype.c --replace \
diff --git a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix
deleted file mode 100644
index 748f67c7448..00000000000
--- a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = [ http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2 http://bellard.org/qemu/linux-0.2.img.bz2];
-			sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1";
-		};
-		buildInputs = [];
-		configureFlags = [];
-	};
-	in with localDefs;
-let 
-doCopy = fullDepEntry ("
-  ensureDir \$out/share/qemu-images
-  cp linux-0.2.img \$out/share/qemu-images/
-") [minInit doUnpack defEnsureDir];
-in
-stdenv.mkDerivation rec {
-	name = "QEmu-Linux-Image-0.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doCopy doForceShare doPropagate]);
-	meta = {
-		description = "Qemu sample image.";
-		inherit src;
-	};
-}
diff --git a/pkgs/applications/virtualization/qemu/linux-img/default.nix b/pkgs/applications/virtualization/qemu/linux-img/default.nix
new file mode 100644
index 00000000000..23e2ab17477
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/linux-img/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "qemu-linux-image-0.2";
+
+  src = fetchurl {
+    url = http://wiki.qemu.org/download/linux-0.2.img.bz2;
+    sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1";
+  };
+
+  unpackPhase = "true";
+
+  installPhase =
+    ''
+      ensureDir $out/share/qemu-images
+      bunzip2 < $src > $out/share/qemu-images/linux-0.2.img
+    '';
+
+  meta = {
+    description = "QEMU sample Linux disk image";
+  };
+}
diff --git a/pkgs/applications/window-managers/fbpanel/4.12.nix b/pkgs/applications/window-managers/fbpanel/default.nix
index 6aa47a490bd..c7bba46ec05 100644
--- a/pkgs/applications/window-managers/fbpanel/4.12.nix
+++ b/pkgs/applications/window-managers/fbpanel/default.nix
@@ -1,4 +1,6 @@
-args : with args;
+{ stdenv, fetchurl, builderDefs, libX11, gtk, pkgconfig, libXmu
+, libXpm, libpng, libjpeg, libtiff, librsvg }:
+
 	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 021681e4efd..e52cb91ec4b 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,17 +1,20 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft }:
 
 stdenv.mkDerivation {
-  name="jwm-2.0.1";
+  name = "jwm-2.0.1";
+  
   src = fetchurl {
      url = http://www.joewing.net/programs/jwm/releases/jwm-2.0.1.tar.bz2;
      sha256 = "1ix5y00cmg3cyazl0adzgv49140zxaf2dpngyg1dyy4ma6ysdmnw";
   };
 
-  buildInputs = [libX11 libXext libXinerama libXpm libXft];
+  buildInputs = [ libX11 libXext libXinerama libXpm libXft ];
 
-  postInstall = ''
-    sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc
-    sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc'';
+  postInstall =
+    ''
+      sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc
+      sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc
+    '';
 
   meta = {
     description = "A window manager for X11 that requires only Xlib";
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index bb9e45b62ac..3f9ef9e6282 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -9,10 +9,6 @@ use File::Basename;
 STDOUT->autoflush(1);
 
 my $out = $ENV{"out"};
-mkdir "$out", 0755 || die "error creating $out";
-
-
-my $symlinks = 0;
 
 
 my @pathsToLink = split ' ', $ENV{"pathsToLink"};
@@ -27,95 +23,58 @@ sub isInPathsToLink {
 }
 
 
-sub symLinkMkdir {
-    my $src = shift;
-    my $dst = shift;
-    my $dir = dirname $dst;
-    mkpath $dir;
-    symlink($src, $dst) ||
-        die "error creating link `$dst': $!";
-    $symlinks++;
-}
-
-
-# For each activated package, create symlinks.
+# For each activated package, determine what symlinks to create.
 
-sub createLinks {
-    my $relName = shift;
-    my $srcDir = shift;
-    my $dstDir = shift;
-    my $ignoreCollisions = shift;
+my %symlinks;
+$symlinks{""} = ""; # create root directory
 
-    my @srcFiles = glob("$srcDir/*");
-
-    foreach my $srcFile (@srcFiles) {
-        my $baseName = $srcFile;
-        $baseName =~ s/^.*\///g; # strip directory
-        my $dstFile = "$dstDir/$baseName";
-        my $relName2 = "$relName/$baseName";
-
-        # Urgh, hacky...
-        if ($srcFile =~ /\/propagated-build-inputs$/ ||
-            $srcFile =~ /\/nix-support$/ ||
-            $srcFile =~ /\/perllocal.pod$/ ||
-            $srcFile =~ /\/info\/dir$/ ||
-            ( $relName2 =~ /^\/share\/mime\// && !( $relName2 =~ /^\/share\/mime\/packages/ ) ) ||
-            $srcFile =~ /\/log$/)
-        {
-            # Do nothing.
-        }
+sub findFiles;
 
-        elsif (-d $srcFile) {
-
-            if (!isInPathsToLink($relName2)) {
-                # This path is not in the list of paths to link, but
-                # some of its children may be.
-                createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
-                next;
-            }
-            
-            lstat $dstFile;
-
-            if (-d _) {
-                createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
-            }
-
-            elsif (-l _) {
-                my $target = readlink $dstFile or die;
-                if (!-d $target) {
-                    die "collission between directory `$srcFile' and non-directory `$target'";
-                }
-                unlink $dstFile or die "error unlinking `$dstFile': $!";
-                mkpath $dstFile;
-                createLinks($relName2, $target, $dstFile, $ignoreCollisions);
-                createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
-            }
-
-            else {
-                symLinkMkdir $srcFile, $dstFile;
-            }
-        }
+sub findFilesInDir {
+    my ($relName, $target, $ignoreCollisions) = @_;
 
-        elsif (-l $dstFile) {
-            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'";
-                }
-            }
-        }
+    opendir DIR, "$target" or die "cannot open `$target': $!";
+    my @names = readdir DIR or die;
+    closedir DIR;
+    
+    foreach my $name (@names) {
+        next if $name eq "." || $name eq "..";
+        findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions);
+    }
+}
+    
+sub findFiles {
+    my ($relName, $target, $baseName, $ignoreCollisions) = @_;
+
+    # Urgh, hacky...
+    return if
+        $relName eq "/propagated-build-inputs" ||
+        $relName eq "/nix-support" ||
+        $relName =~ /info\/dir/ ||
+        ( $relName =~ /^\/share\/mime\// && !( $relName =~ /^\/share\/mime\/packages/ ) ) ||
+        $baseName eq "perllocal.pod" ||
+        $baseName eq "log";
+
+    my $oldTarget = $symlinks{$relName};
+
+    if (!defined $oldTarget) {
+        $symlinks{$relName} = $target;
+        return;
+    }
 
-        else {
-            next unless isInPathsToLink($relName2);
-            symLinkMkdir $srcFile, $dstFile;
+    unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
+        if ($ignoreCollisions) {
+            warn "collision between `$target' and `$oldTarget'";
+            return;
+        } else {
+            die "collision between `$target' and `$oldTarget'";
         }
     }
+
+    findFilesInDir($relName, $oldTarget, $ignoreCollisions) unless $oldTarget eq "";
+    findFilesInDir($relName, $target, $ignoreCollisions);
+    
+    $symlinks{$relName} = ""; # denotes directory
 }
 
 
@@ -130,8 +89,7 @@ sub addPkg($;$) {
     return if (defined $done{$pkgDir});
     $done{$pkgDir} = 1;
 
-#    print "symlinking $pkgDir\n";
-    createLinks("", "$pkgDir", "$out", $ignoreCollisions);
+    findFiles("", "$pkgDir", "", $ignoreCollisions);
 
     my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
     if (-e $propagatedFN) {
@@ -140,7 +98,6 @@ sub addPkg($;$) {
         close PROP;
         my @propagated = split ' ', $propagated;
         foreach my $p (@propagated) {
-            print "$pkgDir propagates $p\n";
             $postponed{$p} = 1 unless defined $done{$p};
         }
     }
@@ -167,17 +124,30 @@ 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";
+
+# Create the symlinks.
+my $nrLinks = 0;
+foreach my $relName (sort keys %symlinks) {
+    my $target = $symlinks{$relName};
+    my $abs = "$out/$relName";
+    next unless isInPathsToLink $relName;
+    if ($target eq "") {
+        #print "creating directory $relName\n";
+        mkpath $abs or die "cannot create directory `$abs': $!";
+    } else {
+        #print "creating symlink $relName to $target\n";
+        symlink $target, $abs ||
+            die "error creating link `$abs': $!";
+        $nrLinks++;
+    }
 }
 
 
-print STDERR "created $symlinks symlinks in user environment\n";
+print STDERR "created $nrLinks symlinks in user environment\n";
 
 
 my $manifest = $ENV{"manifest"};
-if ($manifest ne "") {
+if ($manifest) {
     symlink($manifest, "$out/manifest") or die "cannot create manifest";
 }
 
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index bca7fd71659..3ef0c862964 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -541,10 +541,11 @@ let inherit (builtins) head tail trace; in
      export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out)
    '') ["minInit" "addInputs" "defEnsureDir"];
 
-   fetchUrlFromSrcInfo = srcInfo: fetchurl {
+   fetchUrlFromSrcInfo = srcInfo: fetchurl ({
      url = srcInfo.url;
      sha256 = srcInfo.hash;
-   };
+   } // 
+   (if (srcInfo ? downloadName) then {name = srcInfo.downloadName;} else {}));
 
    fetchGitFromSrcInfo = srcInfo: fetchgit {
      url = srcInfo.url;
diff --git a/pkgs/build-support/builder-defs/template-auto-callable.nix b/pkgs/build-support/builder-defs/template-auto-callable.nix
new file mode 100644
index 00000000000..4801e425302
--- /dev/null
+++ b/pkgs/build-support/builder-defs/template-auto-callable.nix
@@ -0,0 +1,32 @@
+x@{builderDefsPackage
+  (abort "Specify dependencies")
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  s = import ./src-for-default.nix;
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [(abort "Specify helper argument names")];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "${abort ''Specify description''}";
+    maintainers = with a.lib.maintainers;
+    [
+      (abort "Specify maintainers")
+    ];
+    platforms = with a.lib.platforms;
+      (abort "Specify platforms");
+  };
+}) x
+
diff --git a/pkgs/build-support/deb-package/default.nix b/pkgs/build-support/deb-package/default.nix
deleted file mode 100644
index f227dd521a6..00000000000
--- a/pkgs/build-support/deb-package/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-args : with args;	
-	let 
-       	localDefs = with (builderDefs.passthru.function {src="";});
-	let 
-	  checkFlag = flag : lib.attrByPath [flag] false args;
-	in
-	  builderDefs.passthru.function ({
-		inherit src;
-		inherit checkFlag;
-		buildInputs = [];
-		configureFlags = [];
-		makeFlags = if (checkFlag "omitConfigure") 
-		then [" PREFIX=$out "]
-		else [];
-		patch = null;
-		meta = {};
-		doInstall = if args ? Install then 
-		(fullDepEntry 
-		  args.Install 
-		  (["doMake"] 
-		  ++ (lib.attrByPath ["extraInstallDeps"] [] args))
-		)
-		else fullDepEntry "" ["doMakeInstall"];
-
-		debPatch = fullDepEntry ((if args ? patch then ''
-		  gunzip < ${args.patch} | patch -Np1
-		'' else "")
-		+''
-		  sed -e 's/-o root//' -i Makefile Makefile.in Makefile.new || true;
-		  sed -e 's/-g root//' -i Makefile Makefile.in Makefile.new || true;
-		''
-		+(if (checkFlag "omitFilePatches") then "" else 
-		''
-		  if test -d debian/patches; then 
-		    for i in debian/patches/*; do 
-		      patch -Np0 -i $i; 
-		    done;
-		  fi;
-		'')
-		+ (if args ? extraReplacements then 
-		  args.extraReplacements 
-		else ""))["minInit" "doUnpack"];
-	}  // args);
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = localDefs.name + "deb";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs ([debPatch] ++ 
-		(lib.optional (patches != []) "doPatch") ++
-		(lib.optional (! (checkFlag "omitConfigure")) "doConfigure") ++
-    [doInstall doForceShare]));
-	inherit meta;
-	inherit src;
-}
diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix
new file mode 100644
index 00000000000..65e4ca71475
--- /dev/null
+++ b/pkgs/build-support/dotnetenv/build-solution.nix
@@ -0,0 +1,61 @@
+{stdenv, dotnetfx}:
+{ name
+, src
+, baseDir ? "."
+, slnFile
+, targets ? "ReBuild"
+, verbosity ? "detailed"
+, options ? "/p:Configuration=Debug;Platform=Win32"
+, assemblyInputs ? []
+, runtimeAssemblies ? []
+, preBuild ? ""
+}:
+
+stdenv.mkDerivation {
+  inherit name src preBuild;  
+  
+  buildInputs = [ dotnetfx ];  
+  preConfigure = ''
+    cd ${baseDir}
+  '';
+  
+  installPhase = ''        
+    for i in ${toString assemblyInputs}
+    do
+	windowsPath=$(cygpath --windows $i) 
+	echo "Using assembly path: $windowsPath"
+	
+	if [ "$assemblySearchPaths" = "" ]
+	then
+	    assemblySearchPaths="$windowsPath"
+	else
+	    assemblySearchPaths="$assemblySearchPaths;$windowsPath"
+	fi
+    done
+      
+    echo "Assembly search paths are: $assemblySearchPaths"
+    
+    if [ "$assemblySearchPaths" != "" ]
+    then
+	echo "Using assembly search paths args: $assemblySearchPathsArg"
+	export AssemblySearchPaths=$assemblySearchPaths
+    fi
+    
+    ensureDir $out
+    MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options}
+    
+    # Create references to runtime dependencies
+    # !!! Should be more efficient (e.g. symlinking)
+    
+    for i in ${toString runtimeAssemblies}
+    do
+        cd $i
+	
+        for j in $(find . -type f)
+	do
+	    mkdir -p $out/$(dirname $j)
+	    cp $j $out/$(dirname $j)
+	done
+    done
+  '';
+}
diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnetenv/default.nix
new file mode 100644
index 00000000000..577a7a3b5e8
--- /dev/null
+++ b/pkgs/build-support/dotnetenv/default.nix
@@ -0,0 +1,10 @@
+{stdenv, dotnetfx}:
+
+{
+  buildSolution = import ./build-solution.nix {
+    inherit stdenv;
+    dotnetfx = dotnetfx.pkg;
+  };
+  
+  inherit (dotnetfx) assembly20Path wcfPath referenceAssembly30Path referenceAssembly35Path;
+}
diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg
index b2711392acc..b2711392acc 100644..100755
--- a/pkgs/build-support/fetchhg/nix-prefetch-hg
+++ b/pkgs/build-support/fetchhg/nix-prefetch-hg
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 71f1eae86f9..cd53f0d0d55 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -167,6 +167,7 @@ rec {
     ftp://ftp.nl.debian.org/debian/
     ftp://ftp.ru.debian.org/debian/
     ftp://ftp.debian.org/debian/
+    http://archive.debian.org/debian-archive/debian/
   ];
 
   # Ubuntu.
@@ -174,6 +175,7 @@ rec {
     http://nl.archive.ubuntu.com/ubuntu/
     http://de.archive.ubuntu.com/ubuntu/
     http://archive.ubuntu.com/ubuntu/
+    http://old-releases.ubuntu.com/ubuntu/
   ];
 
   # Fedora (please only add full mirrors that carry old Fedora distributions as well).
@@ -194,11 +196,10 @@ rec {
 
   # openSUSE.
   opensuse = [
-    http://opensuse.hro.nl/opensuse/
-    http://ftp.funet.fi/pub/linux/mirrors/opensuse/
-    http://ftp5.gwdg.de/pub/opensuse/
-    http://ftp.opensuse.org/pub/opensuse/
-    http://ftp5.gwdg.de/pub/opensuse/discontinued/
+    http://opensuse.hro.nl/opensuse/distribution/
+    http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/
+    http://ftp.opensuse.org/pub/opensuse/distribution/
+    http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/
   ];
 
   # Gnome (see http://ftp.gnome.org/pub/GNOME/MIRRORS).
@@ -243,6 +244,7 @@ rec {
     http://ftp2.nl.postgresql.org/
     ftp://ftp.nl.postgresql.org/pub/mirror/postgresql/
     ftp://ftp.postgresql.org/pub/
+    ftp://ftp-archives.postgresql.org/pub/
   ];
 
 }
diff --git a/pkgs/build-support/upstream-updater/create-src-info.sh b/pkgs/build-support/upstream-updater/create-src-info.sh
index b5c235dcfcf..fbbbe33a9e7 100755
--- a/pkgs/build-support/upstream-updater/create-src-info.sh
+++ b/pkgs/build-support/upstream-updater/create-src-info.sh
@@ -9,7 +9,7 @@
 
 own_dir="$(cd "$(dirname "$0")"; sh -c pwd)"
 
-cp "$own_dir/../builder-defs/template-bdp-uud.nix" "$1.nix" 
+cp "$own_dir/../builder-defs/template-auto-callable.nix" "$1.nix" 
 sed -e "s@src-for-default.nix@src-for-$1.nix@g" -i "$1.nix"
 echo '{}' > "src-for-$1.nix"
 cat << EOF > src-info-for-$1.nix
diff --git a/pkgs/build-support/upstream-updater/snippets.sh b/pkgs/build-support/upstream-updater/snippets.sh
index dad25384568..2c06696c928 100644
--- a/pkgs/build-support/upstream-updater/snippets.sh
+++ b/pkgs/build-support/upstream-updater/snippets.sh
@@ -4,6 +4,7 @@
 #http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz
 skipRedirectSF='s@sourceforge.net/projects@downloads.sourceforge.net/project@; s@/files@@; s@/download$@@;'
 extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@'
+extractVersionSF='s@.*/[^/0-9]*([0-9].*)[.](tar|tgz|tbz2|zip).*@\1@'
 apacheMirror='s@http://www.apache.org/dist/@mirror://apache/@'
 skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@'
 
diff --git a/pkgs/build-support/upstream-updater/update-upstream-data.sh b/pkgs/build-support/upstream-updater/update-upstream-data.sh
index 006da112fdb..8e4f4490e7b 100755
--- a/pkgs/build-support/upstream-updater/update-upstream-data.sh
+++ b/pkgs/build-support/upstream-updater/update-upstream-data.sh
@@ -36,10 +36,44 @@ baseName="$(getAttr baseName 'unnamed-package')"
 commonPrefetchVars=" version name hash"
 
 prefetchClause=""
+[ fetchSF = "$method" ] && {
+    if [ -z "$forcedUrl" ]; then 
+	freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |
+          eval "egrep \"$(getAttr sourceRegexp '.*[.]tar[.].*|.*[.]tgz$|.*[.]tbz2$')\"" | 
+	  eval "egrep -v \"$(getAttr blacklistRegexp '^$')\"" |
+          eval "$(getAttr choiceCommand 'head -1')")"
+
+	if ! egrep ':' <<< "$freshUrl" ; then 
+		freshUrl="$(dirname "$(getAttr downloadPage).")/$freshUrl"
+	fi
+
+	echo "Found download link: $freshUrl" >&2
+    else
+        freshUrl="$forcedUrl"
+    fi
+
+    freshUrl="$(echo "$freshUrl" | sed -re "$skipRedirectSF")"
+    echo "Sourceforge-corrected URL: $freshUrl" >&2
+    
+    version="$(echo "$freshUrl" | 
+      sed -re "$(getAttr versionExtractorSedScript "$extractVersionSF")")"
+    baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re 's@.*/project/([^/]+)/.*@\1@')")"
+    url="$freshUrl"
+    name="$baseName-$version"
+    advertisedUrl="$freshUrl"
+
+    if [ x"$freshUrl" = x"$(cat "$src_defs_dir"/advertisedUrl)" ]; then
+        echo "Source link not changed" >&2
+        exit
+    fi
+    hash=$(nix-prefetch-url "$freshUrl")
+
+    prefetchVars="url advertisedUrl";
+}
 [ fetchurl = "$method" ] && {
     if [ -z "$forcedUrl" ] ; then
         freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |
-          eval "egrep \"$(getAttr sourceRegexp '.*[.]tar[.].*')\"" | 
+          eval "egrep \"$(getAttr sourceRegexp  '.*[.]tar[.].*|.*[.]tgz$|.*[.]tbz2$')\"" | 
 	  eval "egrep -v \"$(getAttr blacklistRegexp '^$')\"" |
           eval "$(getAttr choiceCommand 'head -1')")"
     
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 67c0f64fc7a..b9882914b26 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -4,15 +4,19 @@ with pkgs;
 
 rec {
 
-
-  inherit (linuxPackages_2_6_32) kernel;
+  # The 15 second CIFS timeout is too short if the host if heavily
+  # loaded (e.g., in the Hydra build farm when it's running many jobs
+  # in parallel).  So apply a patch to increase the timeout to 120s.
+  kernel = assert pkgs.linux.features.cifsTimeout; pkgs.linux;
 
   kvm = pkgs.qemu_kvm;
 
 
   modulesClosure = makeModulesClosure {
     inherit kernel;
-    rootModules = [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" "unix" "sd_mod" "ata_piix" ];
+    rootModules =
+      [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon"
+        "nls_utf8" "ext2" "ext3" "unix" ];
   };
 
 
@@ -134,10 +138,8 @@ rec {
     mkdir -p /fs/dev
     mount -o bind /dev /fs/dev
 
-    for ((n = 0; n < 10; n++)); do
-      echo "mounting host filesystem, attempt $n..."
-      mount -t cifs //10.0.2.4/qemu /fs/hostfs -o guest,username=nobody && break
-    done
+    echo "mounting host filesystem..."
+    mount -t cifs //10.0.2.4/qemu /fs/hostfs -o guest,username=nobody
 
     mkdir -p /fs/nix/store
     mount -o bind /fs/hostfs/nix/store /fs/nix/store
@@ -210,9 +212,11 @@ rec {
 
 
   qemuCommandLinux = ''
-    qemu-system-x86_64 \
+    ${kvm}/bin/qemu-system-x86_64 \
       -nographic -no-reboot \
-      -net nic,model=virtio -chardev socket,id=samba,path=$TMPDIR/samba -net user,guestfwd=tcp:10.0.2.4:139-chardev:samba \
+      -net nic,model=virtio \
+      -chardev socket,id=samba,path=./samba \
+      -net user,guestfwd=tcp:10.0.2.4:139-chardev:samba \
       -drive file=$diskImage,if=virtio,boot=on,cache=writeback,werror=report \
       -kernel ${kernel}/bzImage \
       -initrd ${initrd}/initrd \
@@ -221,31 +225,39 @@ rec {
   '';
 
 
+  startSamba =
+    ''
+      cat > $TMPDIR/smb.conf <<SMB
+      [global]
+        private dir = $TMPDIR
+        smb ports = 0
+        socket address = 127.0.0.1
+        pid directory = $TMPDIR
+        lock directory = $TMPDIR
+        log file = $TMPDIR/log.smbd
+        smb passwd file = $TMPDIR/smbpasswd
+        security = share
+      [qemu]
+        path = /
+        read only = no
+        guest ok = yes
+      SMB
+
+      rm -f ./samba
+      ${socat}/bin/socat unix-listen:./samba exec:"${samba}/sbin/smbd -s $TMPDIR/smb.conf",nofork > /dev/null 2>&1 &
+      while [ ! -e ./samba ]; do sleep 0.1; done # ugly
+    '';
+
+
   vmRunCommand = qemuCommand: writeText "vm-run" ''
     export > saved-env
 
-    PATH=${coreutils}/bin:${kvm}/bin
+    PATH=${coreutils}/bin
 
     diskImage=''${diskImage:-/dev/null}
 
     eval "$preVM"
 
-    cat > smb.conf <<EOF
-      [global]
-        private dir=$TMPDIR
-        smb ports=0
-        socket address=127.0.0.1
-        pid directory=$TMPDIR
-        lock directory=$TMPDIR
-        log file=$TMPDIR/log.smbd
-        smb passwd file=$TMPDIR/smbpasswd
-        security = share
-      [qemu]
-        path=/
-        read only=no
-        guest ok=yes
-    EOF
-
     # Write the command to start the VM to a file so that the user can
     # debug inside the VM if the build fails (when Nix is called with
     # the -K option to preserve the temporary build directory).
@@ -253,8 +265,8 @@ rec {
     #! ${bash}/bin/sh
     diskImage=$diskImage
     TMPDIR=$TMPDIR
-    ${socat}/bin/socat unix-listen:$TMPDIR/samba system:'while true; do ${samba}/sbin/smbd -s $TMPDIR/smb.conf; done' > /dev/null 2>&1 &
-    while [ ! -e $TMPDIR/samba ]; do sleep 0.1; done # ugly
+    cd $TMPDIR
+    ${startSamba}
     ${qemuCommand}
     EOF
 
@@ -275,7 +287,7 @@ rec {
   createEmptyImage = {size, fullName}: ''
     mkdir $out
     diskImage=$out/disk-image.qcow2
-    qemu-img create -f qcow2 $diskImage "${toString size}M"
+    ${kvm}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M"
 
     mkdir $out/nix-support
     echo "${fullName}" > $out/nix-support/full-name
@@ -328,14 +340,14 @@ rec {
 
 
   qemuCommandGeneric = ''
-    qemu-system-x86_64 \
+    ${kvm}/bin/qemu-system-x86_64 \
       -nographic -no-reboot \
       -smb $(pwd) -hda $diskImage \
       $QEMU_OPTS
   '';
 
   
-  /* Run a command in a x86 virtual machine image containing an
+  /* Run a command in an x86 virtual machine image containing an
      arbitrary OS.  The VM should be configured to do the following:
 
      - Write log output to the serial port.
@@ -350,8 +362,7 @@ rec {
      - Write an exit code to "in-vm-exit" on the SMB share ("0"
        meaning success).
 
-     - Reboot to shutdown the machine (because Qemu doesn't seem
-       capable of a APM/ACPI VM shutdown).
+     - Power-off or reboot the machine.
   */
   runInGenericVM = drv: lib.overrideDerivation drv (attrs: {
     system = "i686-linux";
@@ -363,7 +374,7 @@ rec {
       diskImage=$(pwd)/disk-image.qcow2
       origImage=${attrs.diskImage}
       if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi
-      qemu-img create -b "$origImage" -f qcow2 $diskImage
+      ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
 
       echo "$buildCommand" > cmd
 
@@ -390,7 +401,7 @@ rec {
       diskImage=$(pwd)/disk-image.qcow2
       origImage=${attrs.diskImage}
       if test -d "$origImage"; then origImage="$origImage/disk-image.qcow2"; fi
-      qemu-img create -b "$origImage" -f qcow2 $diskImage
+      ${kvm}/bin/qemu-img create -b "$origImage" -f qcow2 $diskImage
     '';
 
     /* Inside the VM, run the stdenv setup script normally, but at the
@@ -473,7 +484,7 @@ rec {
     fi
     diskImage="$1"
     if ! test -e "$diskImage"; then
-      qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage"
+      ${kvm}/bin/qemu-img create -b ${image}/disk-image.qcow2 -f qcow2 "$diskImage"
     fi
     export TMPDIR=$(mktemp -d)
     export out=/dummy
@@ -651,13 +662,16 @@ rec {
      names. */
      
   makeImageFromRPMDist =
-    { name, fullName, size ? 4096, urlPrefix, packagesList, packages
-    , preInstall ? "", postInstall ? "", archs ? ["noarch" "i386"], runScripts ? true}:
+    { name, fullName, size ? 4096, urlPrefix, packagesList
+    , packages, extraPackages ? []
+    , preInstall ? "", postInstall ? "", archs ? ["noarch" "i386"]
+    , runScripts ? true }:
 
     fillDiskWithRPMs {
       inherit name fullName size preInstall postInstall runScripts;
       rpms = import (rpmClosureGenerator {
-        inherit name packagesList urlPrefix packages archs;
+        inherit name packagesList urlPrefix archs;
+        packages = packages ++ extraPackages;
       }) {inherit fetchurl;};
     };
 
@@ -684,11 +698,13 @@ rec {
      names. */
      
   makeImageFromDebDist =
-    {name, fullName, size ? 4096, urlPrefix, packagesList, packages, postInstall ? ""}:
+    { name, fullName, size ? 4096, urlPrefix, packagesList
+    , packages, extraPackages ? [], postInstall ? "" }:
 
     let
       expr = debClosureGenerator {
-        inherit name packagesList urlPrefix packages;
+        inherit name packagesList urlPrefix;
+        packages = packages ++ extraPackages;
       };
     in
       (fillDiskWithDebs {
@@ -697,13 +713,11 @@ rec {
       }) // {inherit expr;};
 
 
-  /* A bunch of functions that build disk images of various Linux
-     distributions, given a set of top-level package names to be
-     installed in the image. */
-
-  diskImageFuns = {
+  /* The set of supported RPM-based distributions. */
+      
+  rpmDistros = {
 
-    fedora2i386 = args: makeImageFromRPMDist ({
+    fedora2i386 = {
       name = "fedora-core-2-i386";
       fullName = "Fedora Core 2 (i386)";
       packagesList = fetchurl {
@@ -712,9 +726,10 @@ rec {
       };
       urlPrefix = mirror://fedora/linux/core/2/i386/os;
       runScripts = false;
-    } // args);
-    
-    fedora3i386 = args: makeImageFromRPMDist ({
+      packages = commonFedoraPackages;
+    };
+
+    fedora3i386 = {
       name = "fedora-core-3-i386";
       fullName = "Fedora Core 3 (i386)";
       packagesList = fetchurl {
@@ -724,9 +739,10 @@ rec {
       urlPrefix = mirror://fedora/linux/core/3/i386/os;
       archs = ["noarch" "i386" "i586"];
       runScripts = false;
-    } // args);
+      packages = commonFedoraPackages;
+    };
     
-    fedora5i386 = args: makeImageFromRPMDist ({
+    fedora5i386 = {
       name = "fedora-core-5-i386";
       fullName = "Fedora Core 5 (i386)";
       packagesList = fetchurl {
@@ -734,9 +750,10 @@ rec {
         sha256 = "0lfk4mzrpiyls8h7k9ckc3vgywbmg05zsr4ag6qakgnv9gljijig";
       };
       urlPrefix = mirror://fedora/linux/core/5/i386/os;
-    } // args);
+      packages = commonFedoraPackages ++ [ "util-linux" ];
+    };
     
-    fedora7i386 = args: makeImageFromRPMDist ({
+    fedora7i386 = {
       name = "fedora-7-i386";
       fullName = "Fedora 7 (i386)";
       packagesList = fetchurl {
@@ -744,9 +761,10 @@ rec {
         sha256 = "0zq7ifirj45wry7b2qkm12qhzzazal3hn610h5kwbrfr2xavs882";
       };
       urlPrefix = mirror://fedora/linux/releases/7/Fedora/i386/os;
-    } // args);
+      packages = commonFedoraPackages;
+    };
     
-    fedora8i386 = args: makeImageFromRPMDist ({
+    fedora8i386 = {
       name = "fedora-8-i386";
       fullName = "Fedora 8 (i386)";
       packagesList = fetchurl {
@@ -754,9 +772,10 @@ rec {
         sha256 = "0vr9345rrk0vhs4pc9cjp8npdkqz0xqyirv84vhyfn533m9ws36f";
       };
       urlPrefix = mirror://fedora/linux/releases/8/Fedora/i386/os;
-    } // args);
+      packages = commonFedoraPackages;
+    };
 
-    fedora9i386 = args: makeImageFromRPMDist ({
+    fedora9i386 = {
       name = "fedora-9-i386";
       fullName = "Fedora 9 (i386)";
       packagesList = fetchurl {
@@ -764,9 +783,10 @@ rec {
         sha256 = "18780xgyag5acx79warcpvzlfkm0mni8xawl6jjvgxg9n3lp6zg0";
       };
       urlPrefix = mirror://fedora/linux/releases/9/Fedora/i386/os;
-    } // args);
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
 
-    fedora9x86_64 = args: makeImageFromRPMDist ({
+    fedora9x86_64 = {
       name = "fedora-9-x86_64";
       fullName = "Fedora 9 (x86_64)";
       packagesList = fetchurl {
@@ -775,9 +795,10 @@ rec {
       };
       urlPrefix = mirror://fedora/linux/releases/9/Fedora/x86_64/os;
       archs = ["noarch" "x86_64"];
-    } // args);
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
 
-    fedora10i386 = args: makeImageFromRPMDist ({
+    fedora10i386 = {
       name = "fedora-10-i386";
       fullName = "Fedora 10 (i386)";
       packagesList = fetchurl {
@@ -785,9 +806,10 @@ rec {
         sha256 = "15ha8pxzvlch707mpy06c7pkr2ra2vpd5b8x30qhydvx8fgcqcx9";
       };
       urlPrefix = mirror://fedora/linux/releases/10/Fedora/i386/os;
-    } // args);
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
 
-    fedora10x86_64 = args: makeImageFromRPMDist ({
+    fedora10x86_64 = {
       name = "fedora-10-x86_64";
       fullName = "Fedora 10 (x86_64)";
       packagesList = fetchurl {
@@ -796,9 +818,10 @@ rec {
       };
       urlPrefix = mirror://fedora/linux/releases/10/Fedora/x86_64/os;
       archs = ["noarch" "x86_64"];
-    } // args);
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
 
-    fedora11i386 = args: makeImageFromRPMDist ({
+    fedora11i386 = {
       name = "fedora-11-i386";
       fullName = "Fedora 11 (i386)";
       packagesList = fetchurl {
@@ -807,9 +830,10 @@ rec {
       };
       urlPrefix = mirror://fedora/linux/releases/11/Fedora/i386/os;
       archs = ["noarch" "i386" "i586"];
-    } // args);
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
 
-    fedora11x86_64 = args: makeImageFromRPMDist ({
+    fedora11x86_64 = {
       name = "fedora-11-x86_64";
       fullName = "Fedora 11 (x86_64)";
       packagesList = fetchurl {
@@ -818,9 +842,10 @@ rec {
       };
       urlPrefix = mirror://fedora/linux/releases/11/Fedora/x86_64/os;
       archs = ["noarch" "x86_64"];
-    } // args);
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
 
-    fedora12i386 = args: makeImageFromRPMDist ({
+    fedora12i386 = {
       name = "fedora-12-i386";
       fullName = "Fedora 12 (i386)";
       packagesList = fetchurl {
@@ -829,9 +854,10 @@ rec {
       };
       urlPrefix = mirror://fedora/linux/releases/12/Fedora/i386/os;
       archs = ["noarch" "i386" "i586" "i686"];
-    } // args);
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
 
-    fedora12x86_64 = args: makeImageFromRPMDist ({
+    fedora12x86_64 = {
       name = "fedora-12-x86_64";
       fullName = "Fedora 12 (x86_64)";
       packagesList = fetchurl {
@@ -840,68 +866,105 @@ rec {
       };
       urlPrefix = mirror://fedora/linux/releases/12/Fedora/x86_64/os;
       archs = ["noarch" "x86_64"];
-    } // args);
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
+
+    fedora13i386 = {
+      name = "fedora-13-i386";
+      fullName = "Fedora 13 (i386)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/13/Fedora/i386/os/repodata/48c649978f695e8bf6214d16ff5413f8ab303976b33d0e96e0a5706e6f870682-primary.xml.gz;
+        sha256 = "10h6hxpnww55w2b0wgdkfqwk1azq2dagy5jd47v8npk9iyblkij8";
+      };
+      urlPrefix = mirror://fedora/linux/releases/13/Fedora/i386/os;
+      archs = ["noarch" "i386" "i586" "i686"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
+
+    fedora13x86_64 = {
+      name = "fedora-13-x86_64";
+      fullName = "Fedora 13 (x86_64)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/13/Fedora/x86_64/os/repodata/ed88d22fca1c8bcc07d85bb677d5f8f45422a373a53b6dd213d57d7dfc278878-primary.xml.gz;
+        sha256 = "0y484zy7szfm2g96sfx5ffij4m7lz3apgdjvv03wr2qwr8px527d";
+      };
+      urlPrefix = mirror://fedora/linux/releases/13/Fedora/x86_64/os;
+      archs = ["noarch" "x86_64"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
+    };
 
-    opensuse103i386 = args: makeImageFromRPMDist ({
+    opensuse103i386 = {
       name = "opensuse-10.3-i586";
       fullName = "openSUSE 10.3 (i586)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/10.3/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/10.3/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "0zb5kxsb755nqq9i8jdclmanacyf551ncx6a011v9jqphsvyfvd7";
       };
-      urlPrefix = mirror://opensuse/distribution/10.3/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/10.3/repo/oss/suse/;
       archs = ["noarch" "i586"];
-    } // args);
+      packages = commonOpenSUSEPackages ++ [ "devs" ];
+    };
 
-    opensuse110i386 = args: makeImageFromRPMDist ({
+    opensuse110i386 = {
       name = "opensuse-11.0-i586";
       fullName = "openSUSE 11.0 (i586)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/11.0/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn";
       };
-      urlPrefix = mirror://opensuse/distribution/11.0/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/11.0/repo/oss/suse/;
       archs = ["noarch" "i586"];
-    } // args);
+      packages = commonOpenSUSEPackages;
+    };
 
-    opensuse110x86_64 = args: makeImageFromRPMDist ({
+    opensuse110x86_64 = {
       name = "opensuse-11.0-x86_64";
       fullName = "openSUSE 11.0 (x86_64)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/11.0/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn";
       };
-      urlPrefix = mirror://opensuse/distribution/11.0/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/11.0/repo/oss/suse/;
       archs = ["noarch" "x86_64"];
-    } // args);
+      packages = commonOpenSUSEPackages;
+    };
 
-    opensuse111i386 = args: makeImageFromRPMDist ({
+    opensuse111i386 = {
       name = "opensuse-11.1-i586";
       fullName = "openSUSE 11.1 (i586)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/11.1/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j";
       };
-      urlPrefix = mirror://opensuse/distribution/11.1/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/11.1/repo/oss/suse/;
       archs = ["noarch" "i586"];
-    } // args);
+      packages = commonOpenSUSEPackages;
+    };
 
-    opensuse111x86_64 = args: makeImageFromRPMDist ({
+    opensuse111x86_64 = {
       name = "opensuse-11.1-x86_64";
       fullName = "openSUSE 11.1 (x86_64)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/11.1/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j";
       };
-      urlPrefix = mirror://opensuse/distribution/11.1/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/11.1/repo/oss/suse/;
       archs = ["noarch" "x86_64"];
-    } // args);
+      packages = commonOpenSUSEPackages;
+    };
+
+  };
 
+
+  /* The set of supported Dpkg-based distributions. */
+      
+  debDistros = {
+  
     # Interestingly, the SHA-256 hashes provided by Ubuntu in
     # http://nl.archive.ubuntu.com/ubuntu/dists/{gutsy,hardy}/Release are
     # wrong, but the SHA-1 and MD5 hashes are correct.  Intrepid is fine.
 
-    ubuntu710i386 = args: makeImageFromDebDist ({
+    ubuntu710i386 = {
       name = "ubuntu-7.10-gutsy-i386";
       fullName = "Ubuntu 7.10 Gutsy (i386)";
       packagesList = fetchurl {
@@ -909,9 +972,10 @@ rec {
         sha1 = "8b52ee3d417700e2b2ee951517fa25a8792cabfd";
       };
       urlPrefix = mirror://ubuntu;
-    } // args);
+      packages = commonDebianPackages;
+    };
         
-    ubuntu804i386 = args: makeImageFromDebDist ({
+    ubuntu804i386 = {
       name = "ubuntu-8.04-hardy-i386";
       fullName = "Ubuntu 8.04 Hardy (i386)";
       packagesList = fetchurl {
@@ -919,9 +983,10 @@ rec {
         sha1 = "db74581ee75cb3bee2a8ae62364e97956c723259";
       };
       urlPrefix = mirror://ubuntu;
-    } // args);
+      packages = commonDebianPackages;
+    };
          
-    ubuntu804x86_64 = args: makeImageFromDebDist ({
+    ubuntu804x86_64 = {
       name = "ubuntu-8.04-hardy-amd64";
       fullName = "Ubuntu 8.04 Hardy (amd64)";
       packagesList = fetchurl {
@@ -929,9 +994,10 @@ rec {
         sha1 = "d1f1d2b3cc62533d6e4337f2696a5d27235d1f28";
       };
       urlPrefix = mirror://ubuntu;
-    } // args);
+      packages = commonDebianPackages;
+    };
          
-    ubuntu810i386 = args: makeImageFromDebDist ({
+    ubuntu810i386 = {
       name = "ubuntu-8.10-intrepid-i386";
       fullName = "Ubuntu 8.10 Intrepid (i386)";
       packagesList = fetchurl {
@@ -939,9 +1005,10 @@ rec {
         sha256 = "70483d40a9e9b74598f2faede7df5d5103ee60055af7374f8db5c7e6017c4cf6";
       };
       urlPrefix = mirror://ubuntu;
-    } // args);
+      packages = commonDebianPackages;
+    };
  
-    ubuntu810x86_64 = args: makeImageFromDebDist ({
+    ubuntu810x86_64 = {
       name = "ubuntu-8.10-intrepid-amd64";
       fullName = "Ubuntu 8.10 Intrepid (amd64)";
       packagesList = fetchurl {
@@ -949,9 +1016,10 @@ rec {
         sha256 = "01b2f3842cbdd5834446ddf91691bcf60f59a726dcefa23fb5b93fdc8ea7e27f";
       };
       urlPrefix = mirror://ubuntu;
-    } // args);
+      packages = commonDebianPackages;
+    };
 
-    ubuntu904i386 = args: makeImageFromDebDist ({
+    ubuntu904i386 = {
       name = "ubuntu-9.04-jaunty-i386";
       fullName = "Ubuntu 9.04 Jaunty (i386)";
       packagesList = fetchurl {
@@ -959,9 +1027,10 @@ rec {
         sha256 = "72c95e4901ad56ce8791723e2ae40bce2399f306f9956cac80e964011e1948d0";
       };
       urlPrefix = mirror://ubuntu;
-    } // args);
+      packages = commonDebianPackages;
+    };
  
-    ubuntu904x86_64 = args: makeImageFromDebDist ({
+    ubuntu904x86_64 = {
       name = "ubuntu-9.04-jaunty-amd64";
       fullName = "Ubuntu 9.04 Jaunty (amd64)";
       packagesList = fetchurl {
@@ -969,9 +1038,10 @@ rec {
         sha256 = "af760ce04e43f066b8938b1abdeff979a642f940515659ede44f7877ca358ca8";
       };
       urlPrefix = mirror://ubuntu;
-    } // args);
+      packages = commonDebianPackages;
+    };
 
-    ubuntu910i386 = args: makeImageFromDebDist ({
+    ubuntu910i386 = {
       name = "ubuntu-9.10-karmic-i386";
       fullName = "Ubuntu 9.10 Karmic (i386)";
       packagesList = fetchurl {
@@ -979,9 +1049,10 @@ rec {
         sha256 = "6e3e813857496f2af6cd7e6ada06b3398fa067a7992c5fd7e8bd8fa92e3548b7";
       };
       urlPrefix = mirror://ubuntu;
-    } // args);
+      packages = commonDebPackages ++ [ "diff" ];
+    };
  
-    ubuntu910x86_64 = args: makeImageFromDebDist ({
+    ubuntu910x86_64 = {
       name = "ubuntu-9.10-karmic-amd64";
       fullName = "Ubuntu 9.10 Karmic (amd64)";
       packagesList = fetchurl {
@@ -989,9 +1060,32 @@ rec {
         sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40";
       };
       urlPrefix = mirror://ubuntu;
-    } // args);
+      packages = commonDebPackages ++ [ "diff" ];
+    };
 
-    debian40i386 = args: makeImageFromDebDist ({
+    ubuntu1004i386 = {
+      name = "ubuntu-10.04-lucid-i386";
+      fullName = "Ubuntu 10.04 Lucid (i386)";
+      packagesList = fetchurl {
+        url = mirror://ubuntu/dists/lucid/main/binary-i386/Packages.bz2;
+        sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa";
+      };
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" ];
+    };
+ 
+    ubuntu1004x86_64 = {
+      name = "ubuntu-10.04-lucid-amd64";
+      fullName = "Ubuntu 10.04 Lucid (amd64)";
+      packagesList = fetchurl {
+        url = mirror://ubuntu/dists/lucid/main/binary-amd64/Packages.bz2;
+        sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0";
+      };
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" ];
+    };
+
+    debian40i386 = {
       name = "debian-4.0r9-etch-i386";
       fullName = "Debian 4.0r9 Etch (i386)";
       packagesList = fetchurl {
@@ -999,9 +1093,10 @@ rec {
         sha256 = "40eeeecc35e6895b6eb0bc601e38fe53fc985d1b1f3fea3766f34763d21f206f";
       };
       urlPrefix = mirror://debian;
-    } // args);
+      packages = commonDebianPackages;
+    };
         
-    debian40x86_64 = args: makeImageFromDebDist ({
+    debian40x86_64 = {
       name = "debian-4.0r9-etch-amd64";
       fullName = "Debian 4.0r9 Etch (amd64)";
       packagesList = fetchurl {
@@ -1009,27 +1104,30 @@ rec {
         sha256 = "cf1c4c7d72e0da45797b046011254d2bd83f5ecb7389c7f30d2561be3f5b2e49";
       };
       urlPrefix = mirror://debian;
-    } // args);
+      packages = commonDebianPackages;
+    };
 
-    debian50i386 = args: makeImageFromDebDist ({
-      name = "debian-5.0.4-lenny-i386";
-      fullName = "Debian 5.0.4 Lenny (i386)";
+    debian50i386 = {
+      name = "debian-5.0.5-lenny-i386";
+      fullName = "Debian 5.0.5 Lenny (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-i386/Packages.bz2;
-        sha256 = "6c5ca67fb401a5d29f02557c290bbaee35c457172d548583b510d49eadd0f9ff";
+        sha256 = "cd8158a16c1d3990d35116dfe88005fe685102f591268f8588d3222a02a11339";
       };
       urlPrefix = mirror://debian;
-    } // args);
+      packages = commonDebianPackages;
+    };
         
-    debian50x86_64 = args: makeImageFromDebDist ({
-      name = "debian-5.0.4-lenny-amd64";
-      fullName = "Debian 5.0.4 Lenny (amd64)";
+    debian50x86_64 = {
+      name = "debian-5.0.5-lenny-amd64";
+      fullName = "Debian 5.0.5 Lenny (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/lenny/main/binary-amd64/Packages.bz2;
-        sha256 = "c3b660b861ed257e82293a350ab868c2ce566bc084d35cc66b7388a881eaf3c5";
+        sha256 = "aceb161a534a641c205fca7eabb27d60180c0616104be49562a0997a44571c42";
       };
       urlPrefix = mirror://debian;
-    } // args);
+      packages = commonDebianPackages;
+    };
 
   };
 
@@ -1057,6 +1155,7 @@ rec {
     "unzip"
   ];
 
+  
   /* Common packages for openSUSE images. */
   commonOpenSUSEPackages = [
     "aaa_base"
@@ -1082,12 +1181,11 @@ rec {
 
 
   /* Common packages for Debian/Ubuntu images. */
-  commonDebianPackages = [
+  commonDebPackages = [
     "base-passwd"
     "dpkg"
     "libc6-dev"
     "perl"
-    "sysvinit"
     "bash"
     "dash"
     "gzip"
@@ -1099,7 +1197,6 @@ rec {
     "make"
     "curl"
     "patch"
-    "diff"
     "locales"
     # Needed by checkinstall:
     "util-linux" 
@@ -1113,109 +1210,64 @@ rec {
     "mktemp"
   ];
 
+  commonDebianPackages = commonDebPackages ++ [ "sysvinit" "diff" ];
+  
 
-  # Ubuntu 9.10 no longer has sysvinit.
-  karmicPackages = lib.filter (x: x != "sysvinit") commonDebianPackages;
-
+  /* A set of functions that build the Linux distributions specified
+     in `rpmDistros' and `debDistros'.  For instance,
+     `diskImageFuns.ubuntu1004x86_64 { }' builds an Ubuntu 10.04 disk
+     image containing the default packages specified above.  Overrides
+     of the default image parameters can be given.  In particular,
+     `extraPackages' specifies the names of additional packages from
+     the distribution that should be included in the image; `packages'
+     allows the entire set of packages to be overriden; and `size'
+     sets the size of the disk in megabytes.  E.g.,
+     `diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"];
+     size = 8192; }' builds an 8 GiB image containing Firefox in
+     addition to the default packages. */
+  diskImageFuns = 
+    (lib.mapAttrs (name: as: as2: makeImageFromRPMDist (as // as2)) rpmDistros) //
+    (lib.mapAttrs (name: as: as2: makeImageFromDebDist (as // as2)) debDistros);
 
-  /* A bunch of disk images. */
+    
+  /* Shorthand for `diskImageFuns.<attr> { extraPackages = ... }'. */
+  diskImageExtraFuns =
+    lib.mapAttrs (name: f: extraPackages: f { inherit extraPackages; }) diskImageFuns;
 
-  diskImages = {
+    
+  /* Default disk images generated from the `rpmDistros' and
+     `debDistros' sets (along with Red Hat 9 and SuSE 9.0 images). */
 
-    redhat9i386 = fillDiskWithRPMs {
-      name = "redhat-9-i386";
-      fullName = "Red Hat Linux 9 (i386)";
-      size = 1024;
-      rpms = import ./rpm/redhat-9-i386.nix {inherit fetchurl;};
-    };
+  diskImages =
+    lib.mapAttrs (name: f: f {}) diskImageFuns //
     
-    suse90i386 = fillDiskWithRPMs {
-      name = "suse-9.0-i386";
-      fullName = "SUSE Linux 9.0 (i386)";
-      size = 1024;
-      rpms = import ./rpm/suse-9-i386.nix {inherit fetchurl;};
-      # Urgh.  The /etc/group entries are installed by aaa_base (or
-      # something) but due to dependency ordering, that package isn't
-      # installed yet by the time some other packages refer to these
-      # entries.
-      preInstall = ''
-        echo 'bin:x:1:daemon' >> /mnt/etc/group
-        echo 'tty:x:5:' >> /mnt/etc/group
-        echo 'disk:x:6:' >> /mnt/etc/group
-        echo 'lp:x:7:' >> /mnt/etc/group
-        echo 'uucp:x:14:' >> /mnt/etc/group
-        echo 'audio:x:17:' >> /mnt/etc/group
-        echo 'video:x:33:' >> /mnt/etc/group
-      '';
-    };
+    { redhat9i386 = fillDiskWithRPMs {
+        name = "redhat-9-i386";
+        fullName = "Red Hat Linux 9 (i386)";
+        size = 1024;
+        rpms = import ./rpm/redhat-9-i386.nix {inherit fetchurl;};
+      };
     
-    fedora2i386 = diskImageExtraFuns.fedora2i386 [];
-    fedora3i386 = diskImageExtraFuns.fedora3i386 [];
-    fedora5i386 = diskImageExtraFuns.fedora5i386 [];
-    fedora7i386 = diskImageExtraFuns.fedora7i386 [];
-    fedora8i386 = diskImageExtraFuns.fedora8i386 [];
-    fedora9i386 = diskImageExtraFuns.fedora9i386 [];
-    fedora9x86_64 = diskImageExtraFuns.fedora9x86_64 [];
-    fedora10i386 = diskImageExtraFuns.fedora10i386 [];
-    fedora10x86_64 = diskImageExtraFuns.fedora10x86_64 [];
-    fedora11i386 = diskImageExtraFuns.fedora11i386 [];
-    fedora11x86_64 = diskImageExtraFuns.fedora11x86_64 [];
-    fedora12i386 = diskImageExtraFuns.fedora12i386 [];
-    fedora12x86_64 = diskImageExtraFuns.fedora12x86_64 [];
-    opensuse103i386 = diskImageExtraFuns.opensuse103i386 [];
-    opensuse110i386 = diskImageExtraFuns.opensuse110i386 [];
-    opensuse110x86_64 = diskImageExtraFuns.opensuse110x86_64 [];
-    opensuse111i386 = diskImageExtraFuns.opensuse111i386 [];
-    opensuse111x86_64 = diskImageExtraFuns.opensuse111x86_64 [];
+      suse90i386 = fillDiskWithRPMs {
+        name = "suse-9.0-i386";
+        fullName = "SUSE Linux 9.0 (i386)";
+        size = 1024;
+        rpms = import ./rpm/suse-9-i386.nix {inherit fetchurl;};
+        # Urgh.  The /etc/group entries are installed by aaa_base (or
+        # something) but due to dependency ordering, that package isn't
+        # installed yet by the time some other packages refer to these
+        # entries.
+        preInstall = ''
+          echo 'bin:x:1:daemon' >> /mnt/etc/group
+          echo 'tty:x:5:' >> /mnt/etc/group
+          echo 'disk:x:6:' >> /mnt/etc/group
+          echo 'lp:x:7:' >> /mnt/etc/group
+          echo 'uucp:x:14:' >> /mnt/etc/group
+          echo 'audio:x:17:' >> /mnt/etc/group
+          echo 'video:x:33:' >> /mnt/etc/group
+        '';
+      };
+      
+    };
     
-    ubuntu710i386 = diskImageExtraFuns.ubuntu710i386 [];
-    ubuntu804i386 = diskImageExtraFuns.ubuntu804i386 [];
-    ubuntu804x86_64 = diskImageExtraFuns.ubuntu804x86_64 [];
-    ubuntu810i386 = diskImageExtraFuns.ubuntu810i386 [];
-    ubuntu810x86_64 = diskImageExtraFuns.ubuntu810x86_64 [];
-    ubuntu904i386 = diskImageExtraFuns.ubuntu904i386 [];
-    ubuntu904x86_64 = diskImageExtraFuns.ubuntu904x86_64 [];
-    ubuntu910i386 = diskImageExtraFuns.ubuntu910i386 [];
-    ubuntu910x86_64 = diskImageExtraFuns.ubuntu910x86_64 [];
-    debian40i386 = diskImageExtraFuns.debian40i386 [];
-    debian40x86_64 = diskImageExtraFuns.debian40x86_64 [];
-    debian50i386 = diskImageExtraFuns.debian50i386 [];
-    debian50x86_64 = diskImageExtraFuns.debian50x86_64 [];
-  };
-
-  diskImageExtraFuns = {
-    fedora2i386 = extraVirtualPackages : diskImageFuns.fedora2i386 { packages = commonFedoraPackages ++ extraVirtualPackages; };
-    fedora3i386 = extraVirtualPackages : diskImageFuns.fedora3i386 { packages = commonFedoraPackages ++ extraVirtualPackages; };
-    fedora5i386 = extraVirtualPackages : diskImageFuns.fedora5i386 { packages = commonFedoraPackages ++ ["util-linux"] ++ extraVirtualPackages; };
-    fedora7i386 = extraVirtualPackages : diskImageFuns.fedora7i386 { packages = commonFedoraPackages ++ extraVirtualPackages; };
-    fedora8i386 = extraVirtualPackages : diskImageFuns.fedora8i386 { packages = commonFedoraPackages ++ extraVirtualPackages; };
-    fedora9i386 = extraVirtualPackages : diskImageFuns.fedora9i386 { packages = commonFedoraPackages       ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
-    fedora9x86_64 = extraVirtualPackages : diskImageFuns.fedora9x86_64 { packages = commonFedoraPackages   ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
-    fedora10i386 = extraVirtualPackages : diskImageFuns.fedora10i386 { packages = commonFedoraPackages     ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
-    fedora10x86_64 = extraVirtualPackages : diskImageFuns.fedora10x86_64 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
-    fedora11i386 = extraVirtualPackages : diskImageFuns.fedora11i386 { packages = commonFedoraPackages     ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
-    fedora11x86_64 = extraVirtualPackages : diskImageFuns.fedora11x86_64 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
-    fedora12i386 = extraVirtualPackages : diskImageFuns.fedora12i386 { packages = commonFedoraPackages     ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
-    fedora12x86_64 = extraVirtualPackages : diskImageFuns.fedora12x86_64 { packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ] ++ extraVirtualPackages; };
-    opensuse103i386 = extraVirtualPackages : diskImageFuns.opensuse103i386 { packages = commonOpenSUSEPackages ++ ["devs"] ++ extraVirtualPackages; };
-    opensuse110i386 = extraVirtualPackages : diskImageFuns.opensuse110i386 { packages = commonOpenSUSEPackages ++ extraVirtualPackages; };
-    opensuse110x86_64 = extraVirtualPackages : diskImageFuns.opensuse110x86_64 { packages = commonOpenSUSEPackages ++ extraVirtualPackages; };
-    opensuse111i386 = extraVirtualPackages : diskImageFuns.opensuse111i386 { packages = commonOpenSUSEPackages ++ extraVirtualPackages; };
-    opensuse111x86_64 = extraVirtualPackages : diskImageFuns.opensuse111x86_64 { packages = commonOpenSUSEPackages ++ extraVirtualPackages; };
-
-    ubuntu710i386 = extraVirtualPackages : diskImageFuns.ubuntu710i386 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    ubuntu804i386 = extraVirtualPackages : diskImageFuns.ubuntu804i386 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    ubuntu804x86_64 = extraVirtualPackages : diskImageFuns.ubuntu804x86_64 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    ubuntu810i386 = extraVirtualPackages : diskImageFuns.ubuntu810i386 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    ubuntu810x86_64 = extraVirtualPackages : diskImageFuns.ubuntu810x86_64 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    ubuntu904i386 = extraVirtualPackages : diskImageFuns.ubuntu904i386 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    ubuntu904x86_64 = extraVirtualPackages : diskImageFuns.ubuntu904x86_64 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    ubuntu910i386 = extraVirtualPackages : diskImageFuns.ubuntu910i386 { packages = karmicPackages ++ extraVirtualPackages; };
-    ubuntu910x86_64 = extraVirtualPackages : diskImageFuns.ubuntu910x86_64 { packages = karmicPackages ++ extraVirtualPackages; };
-    debian40i386 = extraVirtualPackages : diskImageFuns.debian40i386 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    debian40x86_64 = extraVirtualPackages : diskImageFuns.debian40x86_64 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    debian50i386 = extraVirtualPackages : diskImageFuns.debian50i386 { packages = commonDebianPackages ++ extraVirtualPackages; };
-    debian50x86_64 = extraVirtualPackages : diskImageFuns.debian50x86_64 { packages = commonDebianPackages ++ extraVirtualPackages; };
-  };
-
 }
diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix
index ae91cbfe84e..be1ff5d1a92 100644
--- a/pkgs/build-support/vm/test.nix
+++ b/pkgs/build-support/vm/test.nix
@@ -14,7 +14,7 @@ rec {
   buildPatchelfRPM = buildRPM {
     name = "patchelf-rpm";
     src = patchelf.src;
-    diskImage = diskImages.fedora12i386;
+    diskImage = diskImages.fedora13i386;
   };
 
   
diff --git a/pkgs/build-support/vsenv/build-solution.nix b/pkgs/build-support/vsenv/build-solution.nix
new file mode 100644
index 00000000000..7d7d6a86e1f
--- /dev/null
+++ b/pkgs/build-support/vsenv/build-solution.nix
@@ -0,0 +1,18 @@
+{stdenv, vs}:
+{ name
+, src
+, slnFile
+, baseDir ? "."
+, extraBuildInputs ? []
+}:
+
+stdenv.mkDerivation {
+  inherit name src;
+  installPhase = ''
+    cd ${baseDir}
+    vcbuild.exe /rebuild ${slnFile}
+    ensureDir $out
+    cp Debug/* $out
+  '';
+  buildInputs = [ vs ] ++ extraBuildInputs;
+}
diff --git a/pkgs/build-support/vsenv/default.nix b/pkgs/build-support/vsenv/default.nix
new file mode 100644
index 00000000000..68976253519
--- /dev/null
+++ b/pkgs/build-support/vsenv/default.nix
@@ -0,0 +1,7 @@
+{stdenv, vs}:
+
+{
+  buildSolution = import ./build-solution.nix {
+    inherit stdenv vs;
+  };  
+}
diff --git a/pkgs/configs/etc/protocols/builder.sh b/pkgs/configs/etc/protocols/builder.sh
deleted file mode 100644
index 75988087ba5..00000000000
--- a/pkgs/configs/etc/protocols/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-cp $src $out/protocols
diff --git a/pkgs/configs/etc/protocols/default.nix b/pkgs/configs/etc/protocols/default.nix
deleted file mode 100644
index f24e84b4703..00000000000
--- a/pkgs/configs/etc/protocols/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "etc-protocols-1.3";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://losser.labs.cs.uu.nl/~armijn/.nix/protocols;
-    md5 = "6583a05c20dfb3784cd48fef2c59aa05";
-  };
-}
diff --git a/pkgs/configs/etc/services/builder.sh b/pkgs/configs/etc/services/builder.sh
deleted file mode 100644
index c99ae258f26..00000000000
--- a/pkgs/configs/etc/services/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-cp $src $out/services
diff --git a/pkgs/configs/etc/services/default.nix b/pkgs/configs/etc/services/default.nix
deleted file mode 100644
index 94d38db2095..00000000000
--- a/pkgs/configs/etc/services/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "etc-services-1.42";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://losser.labs.cs.uu.nl/~armijn/.nix/services;
-    md5 = "dde31302b080df6ec5fcacee0d56dc90";
-  };
-}
diff --git a/pkgs/data/documentation/rnrs/r3rs.nix b/pkgs/data/documentation/rnrs/r3rs.nix
index adaa03d3a68..d252a1680bd 100644
--- a/pkgs/data/documentation/rnrs/r3rs.nix
+++ b/pkgs/data/documentation/rnrs/r3rs.nix
@@ -1,6 +1,7 @@
-args: with args;
+{ fetchurl, stdenv, texinfo }:
 
-((import ./common.nix)
- (args //
-  { revision = 3;
-    sha256 = "0knrpkr74s8yn4xcqxkqpgxmzdmzrvahh1n1csqc1wwd2rb4vnpr"; }))
+import ./common.nix {
+  inherit fetchurl stdenv texinfo;
+  revision = 3;
+  sha256 = "0knrpkr74s8yn4xcqxkqpgxmzdmzrvahh1n1csqc1wwd2rb4vnpr";
+}
diff --git a/pkgs/data/documentation/rnrs/r4rs.nix b/pkgs/data/documentation/rnrs/r4rs.nix
index 4f444229917..1aa6a49f02d 100644
--- a/pkgs/data/documentation/rnrs/r4rs.nix
+++ b/pkgs/data/documentation/rnrs/r4rs.nix
@@ -1,6 +1,7 @@
-args: with args;
+{ fetchurl, stdenv, texinfo }:
 
-((import ./common.nix)
- (args //
-  { revision = 4;
-    sha256 = "02jgy0lvi5ymkdxwjasg50zl03zmyj8sgnfxxnjnbmif72c0k4p8"; }))
+import ./common.nix {
+  inherit fetchurl stdenv texinfo;
+  revision = 4;
+  sha256 = "02jgy0lvi5ymkdxwjasg50zl03zmyj8sgnfxxnjnbmif72c0k4p8";
+}
diff --git a/pkgs/data/documentation/rnrs/r5rs.nix b/pkgs/data/documentation/rnrs/r5rs.nix
index b53bbf551b2..a0fff6507e4 100644
--- a/pkgs/data/documentation/rnrs/r5rs.nix
+++ b/pkgs/data/documentation/rnrs/r5rs.nix
@@ -1,6 +1,7 @@
-args: with args;
+{ fetchurl, stdenv, texinfo }:
 
-((import ./common.nix)
- (args //
-  { revision = 5;
-    sha256 = "1s2wcslwcgb9j89vjn7qs63qlnsv1481jaw1sgg33fgbgk6a8wrk"; }))
+import ./common.nix {
+  inherit fetchurl stdenv texinfo;
+  revision = 5;
+  sha256 = "1s2wcslwcgb9j89vjn7qs63qlnsv1481jaw1sgg33fgbgk6a8wrk";
+}
diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix
deleted file mode 100644
index 69296a45c24..00000000000
--- a/pkgs/data/fonts/clearlyU/1.9.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://crl.nmsu.edu/~mleisher/cu/cu12-1.9.tar.gz;
-			sha256 = "0256h6f3ky529jc39hh0nvkngy48a0x3gss2z81g5ddi1qzfw0pn";
-		};
-		buildInputs = [mkfontdir mkfontscale];
-		configureFlags = [];
-		doInstall = fullDepEntry (''
-			tar xf ${src}
-			ensureDir $out/share/fonts/
-			cp *.bdf $out/share/fonts
-			cd $out/share/fonts
-			mkfontdir 
-			mkfontscale
-		'') ["minInit" "defEnsureDir" "addInputs"];
-	});
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "clearlyU-12-1.9";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doInstall doForceShare doPropagate]);
-	meta = {
-		description = "A Unicode font";
-		inherit src;
-	};
-}
diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix
new file mode 100644
index 00000000000..32050ac5c28
--- /dev/null
+++ b/pkgs/data/fonts/clearlyU/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+stdenv.mkDerivation {
+  name = "clearlyU-12-1.9";
+
+  src = fetchurl {
+    url = http://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz;
+    sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
+  };
+  
+  buildInputs = [ mkfontdir mkfontscale ];
+
+  installPhase =
+    ''
+      ensureDir $out/share/fonts
+      cp *.bdf $out/share/fonts
+      cd $out/share/fonts
+      mkfontdir 
+      mkfontscale
+    '';
+
+  meta = {
+    description = "A Unicode font";
+  };
+}
diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix
deleted file mode 100644
index f991a387976..00000000000
--- a/pkgs/data/fonts/junicode/0.6.15.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-		  url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
-		  sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns";
-		};
-
-		buildInputs = [unzip];
-		configureFlags = [];
-		doInstall = fullDepEntry (''
-			unzip ${src}
-			ensureDir $out/share/fonts/junicode-ttf
-			cp *.ttf $out/share/fonts/junicode-ttf
-		'') ["minInit" "addInputs" "defEnsureDir"];
-	});
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "junicode-0.6.15";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doInstall doForceShare doPropagate]);
-	meta = {
-		description = "A Unicode font";
-		inherit src;
-	};
-}
-
-
-
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
new file mode 100644
index 00000000000..eb7547e628f
--- /dev/null
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation {
+  name = "junicode-0.6.15";
+
+  src = fetchurl {
+    url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;
+    sha256 = "0p16r5s6qwyz0hayb6k61s5r2sfachlx7r6gpqqx5myx6ipbfdns";
+  };
+
+  buildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  installPhase =
+    ''
+      ensureDir $out/share/fonts/junicode-ttf
+      cp *.ttf $out/share/fonts/junicode-ttf
+    '';
+
+  meta = {
+    description = "A Unicode font";
+  };
+}
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index 4901c7486c3..1d2aa5e62d3 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -1,38 +1,38 @@
-args: with args;
+{ stdenv, fetchurl, wrapFonts }:
+
 let
 
-srcA=
-	fetchurl {
-		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz;
-		sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh";
-	};
-srcB=
-	fetchurl {
-		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz;
-		sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51";
-	};
-srcC=
-	fetchurl {
-		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz;
-		sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh";
-	};	
+  srcA = fetchurl {
+    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz;
+    sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh";
+  };
+  
+  srcB = fetchurl {
+    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz;
+    sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51";
+  };
+  
+  srcC = fetchurl {
+    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz;
+    sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh";
+  };  
 
 in
-wrapFonts (stdenv.mkDerivation {
 
-	name = "ucs-fonts";
-	phases = ["installPhase"];
-	installPhase = ''
-		tar xf ${srcA}
-		tar xf ${srcB}
-		tar xf ${srcC}
-		mkdir -p $out/share/fonts/ucs-fonts
-		cp *.bdf $out/share/fonts/ucs-fonts
-	'';
+wrapFonts (stdenv.mkDerivation {
+  name = "ucs-fonts";
+  
+  phases = ["installPhase"];
+  
+  installPhase = ''
+    tar xf ${srcA}
+    tar xf ${srcB}
+    tar xf ${srcC}
+    mkdir -p $out/share/fonts/ucs-fonts
+    cp *.bdf $out/share/fonts/ucs-fonts
+  '';
 
-	meta = {
-		description = "Unicode bitmap fonts";
-		src = [srcA srcB srcC];
-	};
+  meta = {
+    description = "Unicode bitmap fonts";
+  };
 })
-
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 6a0bb54e516..76d2f3b28c1 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -1,28 +1,37 @@
-args: with args; with debPackage;
-debBuild ({
-  src = fetchurl {
-    url = mirror://debian/pool/main/u/unifont/unifont_5.1.20080914.orig.tar.gz;
-    sha256 = "1p8f3dkg0zy9f5hwn1q728hps258ll84xg9a7xqbhj2csvnsyajd";
+{ stdenv, fetchurl, mkfontscale, mkfontdir, bdftopcf, fontutil }:
+
+let
+
+  ttf = fetchurl {
+    url = http://unifoundry.com/unifont-5.1.20080907.ttf.gz;
+    sha256 = "03ssxsfhnayarzx15mn6khry2kgdxhkkc1bqzgr0c85ab5xm9jxw";
   };
-  patch = fetchurl {
-    url = mirror://debian/pool/main/u/unifont/unifont_5.1.20080914-1.diff.gz;
-    sha256 = "0faicwbjlgy78zrc94ffg52f71msll8kxc43bks40z8qb02nr7qx";
+
+  pcf = fetchurl {
+    url = http://unifoundry.com/unifont-5.1.20080820.pcf.gz;
+    sha256 = "0qwsgaplb2a79w14rrvazby3kwx7vyk08x70n0ih5dr91x3rqaqj";
   };
-  name = "unifont-5.1-20080914";
-  buildInputs = [mkfontscale mkfontdir bdftopcf fontutil perl];
+
+in
+
+stdenv.mkDerivation {
+  name = "unifont-5.1-20080907";
+
+  buildInputs = [ mkfontscale mkfontdir bdftopcf fontutil ];
+
+  unpackPhase = "true";
+  
+  installPhase =
+    ''
+      ensureDir $out/share/fonts $out/share/fonts/truetype
+      cp ${pcf} $out/share/fonts/unifont.pcf.gz
+      gunzip < ${ttf} > $out/share/fonts/truetype/unifont.ttf
+      cd $out/share/fonts
+      mkfontdir 
+      mkfontscale
+    '';
+    
   meta = {
     description = "Unicode font for Base Multilingual Plane.";
   };
-  #extraReplacements = ''sed -e s@/usr/bin/perl@${perl}/bin/perl@ -i hex2bdf.unsplit'';
-  omitConfigure = true;
-  Install = ''
-    ensureDir $out/share/fonts $out/share/fonts/truetype
-    cd font/precompiled
-    cp unifont.pcf.gz $out/share/fonts
-    cp unifont.ttf $out/share/fonts/truetype 
-    cd $out/share/fonts
-    mkfontdir 
-    mkfontscale
-  '';
-  extraInstallDeps = ["defEnsureDir"];
-} // args)
+}
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
new file mode 100644
index 00000000000..ba38d8dc1ab
--- /dev/null
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "wqy-zenhei-0.4.23-1";
+
+  src = fetchurl {
+    url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;
+    sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
+  };
+
+  installPhase =
+    ''
+      ensureDir $out/share/fonts
+      cp *.ttf $out/share/fonts
+    '';
+
+  meta = {
+    description = "A (mainly) Chinese Unicode font";
+  };
+}
+
diff --git a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
deleted file mode 100644
index 4b6120ad108..00000000000
--- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;
-			sha256 = "138nn81ai240av0xvcq4ab3rl73n0qlj3gwr3a36i63ry8vdj5qm";
-		};
-
-		buildInputs = [];
-		configureFlags = [];
-		doInstall = fullDepEntry (''
-			ensureDir $out/share/fonts
-			cp *.ttf $out/share/fonts
-		'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-	});
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "wqy-zenhei-0.4.23-1";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doInstall doForceShare doPropagate]);
-	meta = {
-		description = "A (mainly) Chinese Unicode font";
-		inherit src;
-	};
-}
-
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix
index a1399a1b1f0..c302e3504da 100644
--- a/pkgs/data/misc/shared-desktop-ontologies/default.nix
+++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix
@@ -1,14 +1,27 @@
-{stdenv, fetchurl, cmake}:
+{stdenv, fetchurl, cmake, v ? "0.2"}:
 
-stdenv.mkDerivation {
-  name = "shared-desktop-ontologies-0.2";
+stdenv.mkDerivation rec {
+  name = "shared-desktop-ontologies-${v}";
   src = fetchurl {
-    url = mirror://sourceforge/oscaf/shared-desktop-ontologies-0.2.tar.bz2;
-    sha256 = "1w9gfprrp518hb7nm5wspxjd7xx0h08bph6asrx5vrx7j7fzg4m7";
+    url = "mirror://sf/oscaf/${name}.tar.bz2";
+    sha256 =
+      if v == "0.2" then
+        "1w9gfprrp518hb7nm5wspxjd7xx0h08bph6asrx5vrx7j7fzg4m7"
+      else if v == "0.5" then
+        "1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r"
+      else throw "Unknown version";
   };
   buildInputs = [ cmake ];
-  meta = {
+  meta = with stdenv.lib; {
     description = "Ontologies necessary for the Nepomuk semantic desktop";
-    maintainers = [ stdenv.lib.maintainers.sander ];
+    longDescription = ''
+      The shared-desktop-ontologies package brings the semantic web to the
+      desktop in terms of vocabulary. It contains the well known core
+      ontologies such as RDF and RDFS as well as the Nepomuk ontologies which
+      are used by projects like KDE or Strigi.
+    '';
+    platforms = platforms.all;
+    maintainers = [ maintainers.sander maintainers.urkud ];
   };
 }
+
diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
index 4fb3a68f5d1..61fc028f543 100644
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@@ -1,21 +1,17 @@
 {stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
 
-let version = "1.5"; in 
-
-stdenv.mkDerivation {
-  name = "xkeyboard-config-${version}";
+stdenv.mkDerivation rec {
+  name = "xkeyboard-config-1.9";
 
   src = fetchurl {
-    url = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${version}.tar.bz2";
-    sha256 = "1r276ik3x0jg77zza37ggrnp7zbdvmjyrm9mwxxgzh3bmligy5ff";
+    url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
+    sha256 = "0df2iad598pxw3fzkx10f7irqah0fgawx262d07s04x0whn9ql9b";
   };
 
   buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
 
   patches = [ ./eo.patch ];
 
-  ICONV = "iconv";
-
   preConfigure = ''
     configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86"
     sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh
diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix
index 06aaae06aef..1c358b591a6 100644
--- a/pkgs/desktops/gnome-2.28/default.nix
+++ b/pkgs/desktops/gnome-2.28/default.nix
@@ -9,11 +9,7 @@ rec {
   startupnotification = startup_notification;
   gnomedocutils = gnome_doc_utils;
   gnomeicontheme = gnome_icon_theme;
-
-  # !!! Missing! Need to add these.
-  gnomepanel = throw "gnomepanel not implemented";
-  gtksourceview_24 = gtksourceview;
-
+  gnomepanel = gnome_panel;
 
 #### PLATFORM
 
@@ -186,6 +182,12 @@ rec {
     inherit GConf gnome_keyring;
   };
 
+  libsoup_2_31 = import ./desktop/libsoup/2.31.nix {
+    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl;
+    inherit (pkgs.gtkLibs) glib;
+    inherit GConf gnome_keyring;
+  };
+
   libwnck = import ./desktop/libwnck {
     inherit (pkgs) stdenv fetchurl pkgconfig;
     inherit (pkgs.xlibs) libX11;
@@ -206,7 +208,7 @@ rec {
   };
 
   libgweather = import ./desktop/libgweather {
-    inherit (pkgs) stdenv fetchurl pkgconfig libxml2;
+    inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libtasn1;
     inherit (pkgs.gtkLibs) gtk;
     inherit intltool GConf libsoup;
   };
@@ -264,7 +266,7 @@ rec {
   };
 
   gnome_panel = import ./desktop/gnome-panel {
-    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt;
+    inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt libtasn1;
     libxml2 = pkgs.libxml2Python;
     inherit (pkgs.gtkLibs) glib gtk pango atk;
     inherit (pkgs.xlibs) libXau;
diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
index a240b8fba38..48b2ca2f8ef 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome-2.28/desktop/gnome-panel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, dbus, cairo, popt, which, libxml2, libxslt, bzip2, python
 , glib, gtk, pango, atk, libXau
 , intltool, ORBit2, libglade, libgnome, libgnomeui, libbonobo, libbonoboui, GConf, gnome_menus, gnome_desktop
-, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl}:
+, libwnck, librsvg, libgweather, gnome_doc_utils, libgnomecanvas, libart_lgpl, libtasn1}:
 
 stdenv.mkDerivation {
   name = "gnome-panel-2.28.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
   buildInputs = [ pkgconfig gtk dbus_glib popt which libxml2 libxslt bzip2 python libXau
                   intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop 
-		  libwnck librsvg libgweather gnome_doc_utils ];
+		  libwnck librsvg libgweather gnome_doc_utils libtasn1 ];
   configureFlags = "--disable-scrollkeeper";
   CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/include/gio-unix-2.0 -I${glib}/lib/glib-2.0/include -I${dbus_glib}/include/dbus-1.0 -I${dbus.libs}/include/dbus-1.0 "+
              "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 "+
diff --git a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
index 9ed8eb38d14..45aaf5c3d2f 100644
--- a/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
+++ b/pkgs/desktops/gnome-2.28/desktop/libgweather/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup}:
+{stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1}:
 
 assert stdenv ? glibc;
 
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
     sha256 = "0m4ncqzf13037zvyihydif1asgp6pnzdkmx5qnmffzb1gd6qxzb5";
   };
   configureFlags = "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo";
-  buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup ];
+  buildInputs = [ pkgconfig libxml2 gtk intltool GConf libsoup libtasn1 ];
 }
diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.gnutls.patch b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.gnutls.patch
new file mode 100644
index 00000000000..de4b94f0957
--- /dev/null
+++ b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.gnutls.patch
@@ -0,0 +1,12 @@
+diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c
+--- a/libsoup/soup-gnutls.c
++++ b/libsoup/soup-gnutls.c
+@@ -477,7 +477,7 @@ soup_ssl_wrap_iochannel (GIOChannel *sock, gboolean non_blocking,
+		goto THROW_CREATE_ERROR;
+
+	/* See http://bugzilla.gnome.org/show_bug.cgi?id=581342 */
+-	if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
++	if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.2:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0)
+		goto THROW_CREATE_ERROR;
+
+	if (gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE,
diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix
new file mode 100644
index 00000000000..6ddc76e0f4b
--- /dev/null
+++ b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, 
+  glib, GConf, gnome_keyring}:
+
+stdenv.mkDerivation {
+  name = "libsoup-2.31.2";
+  src = fetchurl {
+    url = mirror://gnome/sources/libsoup/2.31/libsoup-2.31.2.tar.bz2;
+    sha256 = "ae52e970deb0ca5e890d87cf55e555249c086bd56ae1fff69599174ca0075379";
+  };
+  patches = [./2.31.gnutls.patch];
+  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl 
+    glib GConf gnome_keyring ];
+}
diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix
index 984e72c8d7b..e191421e572 100644
--- a/pkgs/desktops/kde-3/kdelibs/default.nix
+++ b/pkgs/desktops/kde-3/kdelibs/default.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation {
     # We're not supposed to use linux/inotify.h, use sys/inotify.h instead.
     # Adapted from Gentoo.
     ./inotify.patch
+    
+    # Fixes compilation issues with openssl-1.0.0
+    ./kdelibs-3.5.10-openssl_1.0.0.patch
   ];
 
   passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
diff --git a/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch b/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch
new file mode 100644
index 00000000000..7a3a96e972f
--- /dev/null
+++ b/pkgs/desktops/kde-3/kdelibs/kdelibs-3.5.10-openssl_1.0.0.patch
@@ -0,0 +1,180 @@
+diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc
+--- kdelibs-3.5.10-old/kio/kssl/kopenssl.cc	2006-07-22 01:16:39.000000000 -0700
++++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc	2010-03-31 09:34:38.000000000 -0700
+@@ -96,9 +96,14 @@
+ static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
+                                    const EVP_CIPHER *,unsigned char *,int ,
+                                             pem_password_cb *, void *) = 0L;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
++static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
++#else
+ static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
+ static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
+ static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
++#endif
+ static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
+ static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
+ static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
+@@ -404,9 +409,14 @@
+       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
+       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
+       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
++      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
++#else
+       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
+       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
+       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
++#endif
+       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
+       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
+       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
+@@ -568,7 +578,7 @@
+       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
+       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
+       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
+-      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
++      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
+ #endif
+ 
+ 
+@@ -956,7 +966,13 @@
+    else return -1;
+ }
+ 
+-
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
++   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
++        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
++   else return -1;
++}
++#else
+ ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
+    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
+    else return 0L;
+@@ -968,7 +984,7 @@
+         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
+    else return -1;
+ }
+-
++#endif
+ 
+ int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
+    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
+diff -Naur kdelibs-3.5.10-old/kio/kssl/kopenssl.h kdelibs-3.5.10-new/kio/kssl/kopenssl.h
+--- kdelibs-3.5.10-old/kio/kssl/kopenssl.h	2006-07-22 01:16:39.000000000 -0700
++++ kdelibs-3.5.10-new/kio/kssl/kopenssl.h	2010-03-31 09:35:20.000000000 -0700
+@@ -48,6 +48,9 @@
+ #include <openssl/stack.h>
+ #include <openssl/bn.h>
+ #undef crypt
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define STACK _STACK
++#endif
+ #endif
+ 
+ #include <kstaticdeleter.h>
+@@ -446,12 +449,12 @@
+     */
+    int PEM_write_bio_X509(BIO *bp, X509 *x);
+ 
+-
++#if OPENSSL_VERSION_NUMBER < 0x10000000L
+    /*
+     *   X509_asn1_meth - used for netscape output
+     */
+    ASN1_METHOD *X509_asn1_meth();
+-
++#endif
+ 
+    /*
+     *   ASN1_i2d_fp - used for netscape output
+@@ -531,6 +534,9 @@
+     */
+    void sk_free(STACK *s);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
++#endif
+ 
+    /* 
+     *  Number of elements in the stack
+@@ -543,6 +549,9 @@
+     */
+    char *sk_value(STACK *s, int n);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
++#endif
+ 
+    /* 
+     *  Create a new stack
+@@ -555,6 +564,9 @@
+     */
+    int sk_push(STACK *s, char *d);
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
++#endif
+ 
+    /* 
+     *  Duplicate the stack
+diff -Naur kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc
+--- kdelibs-3.5.10-old/kio/kssl/ksmimecrypto.cc	2005-10-10 08:05:44.000000000 -0700
++++ kdelibs-3.5.10-new/kio/kssl/ksmimecrypto.cc	2010-03-31 09:34:38.000000000 -0700
+@@ -87,7 +87,7 @@
+ 
+ 
+ STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
+-    STACK_OF(X509) *x509 = sk_new(NULL);
++    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
+     KSSLCertificate *cert = certs.first();
+     while(cert) {
+ 	sk_X509_push(x509, cert->getCert());
+diff -Naur kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc
+--- kdelibs-3.5.10-old/kio/kssl/ksslcertificate.cc	2006-01-19 09:06:12.000000000 -0800
++++ kdelibs-3.5.10-new/kio/kssl/ksslcertificate.cc	2010-03-31 09:34:38.000000000 -0700
+@@ -1003,17 +1003,31 @@
+ QByteArray KSSLCertificate::toNetscape() {
+ QByteArray qba;
+ #ifdef KSSL_HAVE_SSL
+-ASN1_HEADER ah;
+-ASN1_OCTET_STRING os;
+-KTempFile ktf;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	NETSCAPE_X509 nx;
++	ASN1_OCTET_STRING hdr;
++#else
++   ASN1_HEADER ah;
++   ASN1_OCTET_STRING os;
++#endif
++	KTempFile ktf;
+ 
+-	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
+-	os.length = strlen(NETSCAPE_CERT_HDR);
+-	ah.header = &os;
+-	ah.data = (char *)getCert();
+-	ah.meth = d->kossl->X509_asn1_meth();
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
++	hdr.length = strlen(NETSCAPE_CERT_HDR);
++	nx.header = &hdr;
++	nx.cert = getCert();
++
++	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
++#else
++   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
++   os.length = strlen(NETSCAPE_CERT_HDR);
++   ah.header = &os;
++   ah.data = (char *)getCert();
++   ah.meth = d->kossl->X509_asn1_meth();
+ 
+-	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
++   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
++#endif
+ 
+ 	ktf.close();
+ 
diff --git a/pkgs/desktops/kde-4.4/accessibility/default.nix b/pkgs/desktops/kde-4.4/accessibility/default.nix
index 2e32523aa2a..2ca4b5732da 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.4";
+  name = "kdeaccessibility-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdeaccessibility-4.4.4.tar.bz2;
-    sha256 = "0v3fbm7wp42fnyxzpk1vlp95z4jn9rf56i075p8g2xvz6gxxgh30";
+    url = mirror://kde/stable/4.4.5/src/kdeaccessibility-4.4.5.tar.bz2;
+    sha256 = "1j8ndr7hjkqka64kyy7whxg9vzxyym0a6pd1wbr6hp1a99mhz4jv";
   };
   # 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 0e202852574..accfe407488 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.4";
+  name = "kdeadmin-4.4.5";
   
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdeadmin-4.4.4.tar.bz2;
-    sha256 = "04jyvnwv8xwzchvzgns2db4bhr0fxis98am58icz6qva9nsgr6zh";
+    url = mirror://kde/stable/4.4.5/src/kdeadmin-4.4.5.tar.bz2;
+    sha256 = "1jmjvjjpkcjqdxyxc4n5z3l3p4hy8par06n7xicbzx9a1mzj71wy";
   };
   
   builder = ./builder.sh;
diff --git a/pkgs/desktops/kde-4.4/artwork/default.nix b/pkgs/desktops/kde-4.4/artwork/default.nix
index 04d2730206b..a2a9a64792f 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.4";
+  name = "kdeartwork-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdeartwork-4.4.4.tar.bz2;
-    sha256 = "1pn50kaf77wxzlnw2fabfwg9xxzcw7wlm85525w3all936k5m7yv";
+    url = mirror://kde/stable/4.4.5/src/kdeartwork-4.4.5.tar.bz2;
+    sha256 = "1m12rj83wp36a3ii8frx52jk7hi7g8rb451n4g9hg5rdbllcfs93";
   };
   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 fa19a0f7dc5..a53cded1f35 100644
--- a/pkgs/desktops/kde-4.4/base-runtime/default.nix
+++ b/pkgs/desktops/kde-4.4/base-runtime/default.nix
@@ -1,16 +1,22 @@
 { stdenv, fetchurl, lib, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, shared_mime_info, exiv2, libssh
-, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica}:
+, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica, virtuoso, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "kdebase-runtime-4.4.4";
+  name = "kdebase-runtime-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdebase-runtime-4.4.4.tar.bz2;
-    sha256 = "1gxa05i6zvklxng6ak5vak05dyay8j8g2hmdhma2290lwgf8gbx8";
+    url = mirror://kde/stable/4.4.5/src/kdebase-runtime-4.4.5.tar.bz2;
+    sha256 = "0a0lg0vkdq8v3rydg6n6nk3gqc3vn3sz2rn5gzm0vd2k5wyy8frx";
   };
+
 /*  CLUCENE_HOME=cluceneCore;*/
-  # Still have to look into Soprano Virtuoso
   buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info exiv2 libssh
-                  kdelibs automoc4 phonon strigi soprano cluceneCore attica ];
+                  kdelibs automoc4 phonon strigi soprano cluceneCore attica makeWrapper];
+
+  postInstall = ''
+    wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
+        --prefix PATH : "${virtuoso}/bin"
+  '';
+
   meta = {
     description = "KDE runtime";
     longDescription = "Libraries and tools which supports running KDE desktop applications";
diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix
index aa18f4d3a89..b2bf3bc9abc 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.4";
+  name = "kdebase-workspace-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdebase-workspace-4.4.4.tar.bz2;
-    sha256 = "1ryy9bmghr8c9hc87i1scmxaw3zdy3gndwwp7qyn5zqzh0jg0b8k";
+    url = mirror://kde/stable/4.4.5/src/kdebase-workspace-4.4.5.tar.bz2;
+    sha256 = "1ri0ghvbnjflpqzwgyhs3bl17gh2cvjffkcd6w0yymarv6n5sisk";
   };
   buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
     kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
diff --git a/pkgs/desktops/kde-4.4/base/default.nix b/pkgs/desktops/kde-4.4/base/default.nix
index 2a3286cbbf3..085b720c08a 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.4";
+  name = "kdebase-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdebase-4.4.4.tar.bz2;
-    sha256 = "10cy6a65lb0164biijiqdwphd9isccac0fg1b66i58xsxpgn4x6w";
+    url = mirror://kde/stable/4.4.5/src/kdebase-4.4.5.tar.bz2;
+    sha256 = "1q3bmpskrfqddyywn895xdp9p53hbd7siabvla7w6z35azi9fpn9";
   };
   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/builder.sh b/pkgs/desktops/kde-4.4/bindings/builder.sh
deleted file mode 100644
index e3f1df28b77..00000000000
--- a/pkgs/desktops/kde-4.4/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.4/bindings/default.nix b/pkgs/desktops/kde-4.4/bindings/default.nix
index 13d6d4057f8..0c3dfd8cf80 100644
--- a/pkgs/desktops/kde-4.4/bindings/default.nix
+++ b/pkgs/desktops/kde-4.4/bindings/default.nix
@@ -6,12 +6,19 @@
 # some bindings are even broken.
 
 stdenv.mkDerivation {
-  name = "kdebindings-4.4.4";
+  name = "kdebindings-4.4.5";
+  
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdebindings-4.4.4.tar.bz2;
-    sha256 = "1wn5hxv1sc0qywgq2bx2brzljlmw7kybbf2hcyiz322air753zdw";
+    url = mirror://kde/stable/4.4.5/src/kdebindings-4.4.5.tar.bz2;
+    sha256 = "0l8lk8vl68jc82lai4ljlm9ph53q4fn0ki0jq45lizdmqjgvahy4";
   };
-  #builder = ./builder.sh;
+
+  patches =
+    [ (fetchurl {
+        url = "http://bugs.gentoo.org/attachment.cgi?id=238975";
+        sha256 = "0vng8j8fhbq5ys8hy0bcvi6x2bym9j65dh61m2c1dr3z7rsx2bqb";
+      })
+    ];
   
   # Disable smoke because I don't need it and gives us an error
   cmakeFlags = [ "-DENABLE_SMOKE=OFF" ];
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 24ebfbe58c8..fbdd9a5240e 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -41,7 +41,7 @@ pkgs.recurseIntoAttrs (rec {
   };
   
   akonadi = import ./support/akonadi {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 shared_mime_info libxslt boost mysql;
+    inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost mysql;
     inherit automoc4 soprano;
   };
   
@@ -83,8 +83,8 @@ pkgs.recurseIntoAttrs (rec {
   };
   
   kdebase_runtime = import ./base-runtime {
-    inherit (pkgs) stdenv fetchurl lib cmake perl bzip2 xz qt4 exiv2 libssh;
-    inherit (pkgs) shared_mime_info xineLib alsaLib samba cluceneCore;
+    inherit (pkgs) stdenv fetchurl lib cmake perl bzip2 xz qt4 exiv2 libssh makeWrapper;
+    inherit (pkgs) shared_mime_info xineLib alsaLib samba cluceneCore virtuoso;
     inherit kdelibs attica;
     inherit automoc4 phonon strigi soprano;
   };
@@ -171,7 +171,7 @@ pkgs.recurseIntoAttrs (rec {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python shared_mime_info;
     inherit (pkgs.xlibs) libXtst libXi;    
     inherit kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu;
-    inherit automoc4 phonon soprano eigen qimageblitz attica;
+    inherit automoc4 phonon soprano eigen qimageblitz attica qca2;
   };
   
   kdegames = import ./games {
@@ -200,7 +200,8 @@ pkgs.recurseIntoAttrs (rec {
   };
   
   kdesdk = import ./sdk {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt boost subversion apr aprutil shared_mime_info;
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl libxml2 libxslt boost
+      subversion apr aprutil shared_mime_info hunspell;
     inherit kdelibs kdepimlibs;
     inherit automoc4 phonon strigi;
   };
@@ -283,7 +284,7 @@ pkgs.recurseIntoAttrs (rec {
   
   koffice = import ./extragear/koffice {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 giflib libxml2 libxslt boost glew;
-    inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf;
+    inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf fftw;
     inherit kdelibs kdepimlibs;
     inherit automoc4 phonon qimageblitz qca2 eigen soprano;
     poppler = pkgs.popplerQt4;
@@ -315,6 +316,13 @@ pkgs.recurseIntoAttrs (rec {
     inherit (pkgs) stdenv fetchurl cmake perl gettext;
     inherit kdelibs automoc4 qt4 phonon;
   };
+  
+  k3b = import ./extragear/k3b {
+    inherit (pkgs) stdenv fetchurl cmake qt4 perl shared_mime_info libvorbis taglib gettext;
+    inherit (pkgs) ffmpeg flac libsamplerate libdvdread lame libsndfile libmad;
+    inherit kdelibs kdemultimedia;
+    inherit automoc4 phonon;
+  };
 
 ### LOCALIZATION
 
diff --git a/pkgs/desktops/kde-4.4/edu/default.nix b/pkgs/desktops/kde-4.4/edu/default.nix
index 8b98e6d5d8a..38541fc730e 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.4";
+  name = "kdeedu-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdeedu-4.4.4.tar.bz2;
-    sha256 = "0rdpay0xs5j0k5r2m5yxm89ls5x7rzj9k758axz22r6wv1xynvz0";
+    url = mirror://kde/stable/4.4.5/src/kdeedu-4.4.5.tar.bz2;
+    sha256 = "1n5r50w6510jr2l7faxkbz684bj1aw7s2arxqvasfs51hn2jl9qk";
   };
 #TODO: facile, indi, boost.python, cfitsio, R, qalculate
   buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl xplanet
diff --git a/pkgs/desktops/kde-4.4/extragear/k3b/default.nix b/pkgs/desktops/kde-4.4/extragear/k3b/default.nix
new file mode 100644
index 00000000000..835dbe69593
--- /dev/null
+++ b/pkgs/desktops/kde-4.4/extragear/k3b/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib
+, ffmpeg, flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext
+, kdelibs, kdemultimedia
+, automoc4, phonon
+}:
+
+stdenv.mkDerivation {
+  name = "k3b-2.0.0";
+  src = fetchurl {
+    url = mirror://sourceforge/k3b/k3b-2.0.0.tar.bz2;
+    sha256 = "0jrl4z9k5ml82xd903n4dm68fvmrkyp3k7c17b2494y2gawzqwfz";
+  };
+  buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib 
+                  ffmpeg flac libsamplerate libdvdread lame libsndfile
+		  libmad gettext stdenv.gcc.libc
+                  kdelibs kdemultimedia automoc4 phonon ];
+  meta = {
+    description = "CD/DVD Burning Application for KDE";
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
index 069afd27281..2bc5ea5fab8 100644
--- a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
-, shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf
+, shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf, fftw
 , kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}:
 
 stdenv.mkDerivation {
@@ -9,8 +9,9 @@ stdenv.mkDerivation {
     sha256 = "0qa73grmn4c2d7zs5p0sxg6dws8hpg8v2vgp6frhj55l0sk3kqba";
   }; 
   buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info 
-                  poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc
+                  poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc fftw
                   kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen soprano ];
+  patches = [ ./wpd.patch ];
   meta = {
     description = "KDE integrated Office Suite";
     license = "GPL";
diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch b/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch
new file mode 100644
index 00000000000..2b0af918bae
--- /dev/null
+++ b/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch
@@ -0,0 +1,24 @@
+diff --git a/cmake/modules/FindWPD.cmake b/cmake/modules/FindWPD.cmake
+index 9bd788c..927785a 100644
+--- a/cmake/modules/FindWPD.cmake
++++ b/cmake/modules/FindWPD.cmake
+@@ -19,14 +19,17 @@ if (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
+ else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
+ if(NOT WIN32)
+   INCLUDE(FindPkgConfig)
+-  pkg_check_modules(WPD libwpd-0.8)
++  pkg_check_modules(PKG_WPD libwpd-0.8)
+ endif(NOT WIN32)
+ 
+   FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h
+-    ${WPD_INCLUDE_DIR}
++    ${PKG_WPD_INCLUDE_DIRS}
+     /usr/include/libwpd-0.8
+   )
+ 
++  FIND_LIBRARY(WPD_LIBRARIES wpd-0.8
++    ${PKG_WPD_LIBRARY_DIRS}
++  )
+ 
+   include(FindPackageHandleStandardArgs)
+   FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPD DEFAULT_MSG WPD_INCLUDE_DIR WPD_LIBRARIES )
diff --git a/pkgs/desktops/kde-4.4/extragear/konversation/default.nix b/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
index e42602cceff..b8902933308 100644
--- a/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
@@ -2,17 +2,12 @@
 , kdelibs, kdepimlibs, automoc4, phonon, qca2}:
 
 stdenv.mkDerivation {
-  name = "konversation-1.2.3";
+  name = "konversation-1.3";
   src = fetchurl {
-    url = mirror://kde/stable/konversation/1.2.3/src/konversation-1.2.3.tar.bz2;
-    sha256 = "06h0j6clgb7b208i7y9n93zfqajgd7y0wf853r535rd1ysi3kjmg";
+    url = mirror://kde/stable/konversation/1.3/src/konversation-1.3.tar.bz2;
+    sha256 = "05gs75j4qza7i7yydy7rcqhp70r6zblbai5k1fygyhsd23ryqq9n";
   };
   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";
diff --git a/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix b/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix
index 30d3d6a9c2c..c149491d3e8 100644
--- a/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix
+++ b/pkgs/desktops/kde-4.4/extragear/yakuake/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, kdelibs, cmake, gettext, perl, automoc4, qt4, phonon }:
 
 stdenv.mkDerivation rec {
-  name = "yakuake-2.9.6";
+  name = "yakuake-2.9.7";
 
   src = fetchurl {
     url = "http://download.berlios.de/yakuake/${name}.tar.bz2";
-    sha256 = "08n6kdzk205rq1bs4yx5f2qawz6xigdhn9air0pbjsi1j630yfzq";
+    sha256 = "0azzvbh3jwz8yhn6gqd46ya7589sadfjyysw230vlf0zlfipdlvd";
   };
 
   buildInputs = [ kdelibs cmake gettext perl automoc4 qt4 phonon stdenv.gcc.libc ];
diff --git a/pkgs/desktops/kde-4.4/games/default.nix b/pkgs/desktops/kde-4.4/games/default.nix
index 74c710edf47..2c72ad03d8e 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.4";
+  name = "kdegames-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdegames-4.4.4.tar.bz2;
-    sha256 = "0zs7r9bc7az6px1745jkrqzsgv6lmhvn1rdsw3jpzcb8qk8qk5wv";
+    url = mirror://kde/stable/4.4.5/src/kdegames-4.4.5.tar.bz2;
+    sha256 = "02p4ggwk1rdxljax2iry7hirh90llcbqwynccxz4n4j6q219k6d3";
   };
   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 807ca12a369..250b6bfe889 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.4";
+  name = "kdegraphics-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdegraphics-4.4.4.tar.bz2;
-    sha256 = "1czrasc3ppk4waxsv4mcps25lbdvdspwgnsnad32b0qq0dls3mn1";
+    url = mirror://kde/stable/4.4.5/src/kdegraphics-4.4.5.tar.bz2;
+    sha256 = "1y9ndv0gajhyqiavm4zml6dyn1czrpan03wcn4civkcsgrm3gz8y";
   };
   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 f013409b337..589b8ac040a 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.4";
+    name = "kde-l10n-${attr.lang}-4.4.5";
     src = fetchurl {
       url = attr.url;
       sha256 = attr.sha256;
@@ -23,344 +23,344 @@ in
 
   ar = deriv {
     lang = "ar";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ar-4.4.4.tar.bz2";
-    sha256 = "0x5ravkd2pba64vc0ss0r98plmxan07pkvqv1nc0h3bkrkv6bcm0";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-ar-4.4.5.tar.bz2";
+    sha256 = "1nc5kpy4cq7cjck6dfzql9djmnimz0khngscdrl8yhahg78sndq7";
   };
 
   bg = deriv {
     lang = "bg";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-bg-4.4.4.tar.bz2";
-    sha256 = "1xvx4c3v3pifpqq3qd3xkrhrc9xnkg5hhczd30akrphq8551z2sc";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-bg-4.4.5.tar.bz2";
+    sha256 = "136llbcv3955ih33ih0j2ccbnj4whc9jidf9flr7kpkz5pin4k11";
   };
 
   ca = deriv {
     lang = "ca";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ca-4.4.4.tar.bz2";
-    sha256 = "0klixkxm1kgynpnzp8glxpj236x5n9p0nbd8ml3xzbk2pfamyay4";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-ca-4.4.5.tar.bz2";
+    sha256 = "1qc9ka78qcmy0pq9q7xa61lmcfz77picxlzs0g46npv073kyn4xp";
   };
 
   cs = deriv {
     lang = "cs";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-cs-4.4.4.tar.bz2";
-    sha256 = "0lzsddqwr3wr0fa33rfcqim3p708c5hbwlazzs1xckwgl4ww97ri";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-cs-4.4.5.tar.bz2";
+    sha256 = "0q9cay61sv6rrsim3v91n8xbpsc0qm97sbhgaa6p5s63xpvpjzp8";
   };
 
   csb = deriv {
     lang = "csb";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-csb-4.4.4.tar.bz2";
-    sha256 = "0qr1l01xvjgvg1qjm8j01vpaiz61md9d78qmz3384f72q9iz6jbk";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-csb-4.4.5.tar.bz2";
+    sha256 = "1yy1jdjskz96nha1lmxy4yjl8wfljp4qgzydxw2pcac54hr6wgxr";
   };
 
   da = deriv {
     lang = "da";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-da-4.4.4.tar.bz2";
-    sha256 = "0rvsap9y23mi16mfjq46dhw0628mia8k7criywdhkxhhv4dkmm1w";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-da-4.4.5.tar.bz2";
+    sha256 = "0qdqa31i0vyg95dqbwg3zyprzdgq7xmvk3iax5dsi9q2bms1cxq5";
   };
 
   de = deriv {
     lang = "de";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-de-4.4.4.tar.bz2";
-    sha256 = "0n9mlkvpl0xyyaxc4sjcrkj9x6n08qiljv01xh8mwwzd2v7pyprh";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-de-4.4.5.tar.bz2";
+    sha256 = "0562srr33k648q8xc3865j9clrwqj8ihv7n6f7dmnbkcn93jcp5x";
   };
 
   el = deriv {
     lang = "el";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-el-4.4.4.tar.bz2";
-    sha256 = "08w17ym9gfbfxavhnd4l2cvlkz0n93d842a5q2nddgd5fx74572w";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-el-4.4.5.tar.bz2";
+    sha256 = "1rc7cap8xb28bv7f1fk3m1mbylixy246zq4srws0pawdfdm9k5nj";
   };
 
   en_GB = deriv {
     lang = "en_GB";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-en_GB-4.4.4.tar.bz2";
-    sha256 = "042mcshf5829vc6ix4rng0vkfl0y36yq4zyamnrawzp6b23y5i5m";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-en_GB-4.4.5.tar.bz2";
+    sha256 = "0zpj06jx77fviv90k56br94fn28bimfhva3r12idr6fli5il99y5";
   };
 
   eo = deriv {
     lang = "eo";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-eo-4.4.4.tar.bz2";
-    sha256 = "0dsl6aqawyyv4fhr88cj9gmmccppyrwch4vggdnsj9hm7mq8lvcb";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-eo-4.4.5.tar.bz2";
+    sha256 = "1mwmlg4dxk1alzq768j07ccyflil60dm63d6008s2hg4jw0pgpkr";
   };
 
   es = deriv {
     lang = "es";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-es-4.4.4.tar.bz2";
-    sha256 = "0yd0cabrbbhmj8p0w9x38aii1w9xhxx08bp2vi0hdk9fw83pa298";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-es-4.4.5.tar.bz2";
+    sha256 = "0flddrdkys6p7cd5vfakdl2g7vpc6h277a4phszmlnssfr2jlhib";
   };
 
   et = deriv {
     lang = "et";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-et-4.4.4.tar.bz2";
-    sha256 = "175731akqds7z2mx9lscy56da2pbwqj4abk6i41l5hs3dfwlcgs8";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-et-4.4.5.tar.bz2";
+    sha256 = "0vpn8ylr336i9hax24jvxxy284gaw7jcxwqxgkqc3c7fl9nji7xz";
   };
 
   eu = deriv {
     lang = "eu";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-eu-4.4.4.tar.bz2";
-    sha256 = "1783nw4hyxzs3sn1dgnqj7krp35ffzfqnw9jyn5hxrz0filzw4cm";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-eu-4.4.5.tar.bz2";
+    sha256 = "0q0h2q73jha1vgk60b1ycfh2ci5vavscva9a1xl42rzkxrqzp7bw";
   };
 
   fi = deriv {
     lang = "fi";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-fi-4.4.4.tar.bz2";
-    sha256 = "066hc5p8vka8kl7ascb9vwvxjspxnysjhj4v3brs070prakv63d8";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-fi-4.4.5.tar.bz2";
+    sha256 = "19anfv3jxlnzs6mx5qlfj9v6nxxpbn2g5vppj771y7ir2wgx79gx";
   };
 
   fr = deriv {
     lang = "fr";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-fr-4.4.4.tar.bz2";
-    sha256 = "1b9w0hicgg3rxfgwf11rajcjml5h181llks8p7blasmbcsvccrri";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-fr-4.4.5.tar.bz2";
+    sha256 = "09qzm6zr8rjsr50bxr3cnsfj4l4qpzf1dmkx3qk0vvvmagry23vy";
   };
 
   fy = deriv {
     lang = "fy";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-fy-4.4.4.tar.bz2";
-    sha256 = "1iwnmpv2dpvmmp5a8iwc07ag8ry3sjdmcx2w87la3drwmbx319gq";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-fy-4.4.5.tar.bz2";
+    sha256 = "01pa23gxy0a3jsnsdvsbgsfdfvwiancyx3w4fw3gx4b4j9y9gfry";
   };
 
   ga = deriv {
     lang = "ga";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ga-4.4.4.tar.bz2";
-    sha256 = "1lvnimdndh9zqq69a6s8pyszrw5x08p4qikrq7mhgjh4v44crk3q";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-ga-4.4.5.tar.bz2";
+    sha256 = "0dfq497v8shzr2r1nqs093nyd32ka74wznp20z2wgsw8yfylgbhs";
   };
 
   gl = deriv {
     lang = "gl";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-gl-4.4.4.tar.bz2";
-    sha256 = "1n7y15fgi940r07vm26h30ijhq50w6l8a12a3mbsc1fyz8lnkf1k";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-gl-4.4.5.tar.bz2";
+    sha256 = "0lp443wpi7gj7i078mxbxswk4niziqc5iyw4mx94cm4g0h2k3cba";
   };
 
   gu = deriv {
     lang = "gu";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-gu-4.4.4.tar.bz2";
-    sha256 = "1594rdmk2b59zah8s8v7g1d5r761cqk7ynxs7mi7lf644xy03b2p";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-gu-4.4.5.tar.bz2";
+    sha256 = "0s959r1c5klh0cr6mczmmfzsgvzyihpacia46q8ckvjddx7zmb0b";
   };
 
   he = deriv {
     lang = "he";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-he-4.4.4.tar.bz2";
-    sha256 = "091c56g2h2hbxhpd0l9xsbbs2pdmsy4a8bisii7vm943q158pc23";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-he-4.4.5.tar.bz2";
+    sha256 = "090s786g9f1jas8dqsh7hqx5idzckd0lg5gz1v7fx254qnfmj6rx";
   };
 
   hi = deriv {
     lang = "hi";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-hi-4.4.4.tar.bz2";
-    sha256 = "17095ija6vnx70cpahpw2ynpp2jb4jrr4dfpx7yp68lnqwyaqa8b";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-hi-4.4.5.tar.bz2";
+    sha256 = "1ysw8h7v0a2idf13jxi46k1b28vg8yl11hfzin4ihfbr5q03fqck";
   };
 
   hr = deriv {
     lang = "hr";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-hr-4.4.4.tar.bz2";
-    sha256 = "1bpzsm10shippwj0w01y6jjf38bl97kmbbj06h6dzd7p4dk0km5b";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-hr-4.4.5.tar.bz2";
+    sha256 = "0fh7mfzy41mx0c3mvrv2rdwmk82mrlb84azzvfsanznzk74pnbgr";
   };
 
   hu = deriv {
     lang = "hu";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-hu-4.4.4.tar.bz2";
-    sha256 = "1032m9a5g4y9x7lfhbnm1zl63m10vcikykza2ix5ks2q8ca9123h";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-hu-4.4.5.tar.bz2";
+    sha256 = "1yw91mzc4mcjzqk7syxkxybby6ay02z8ssbhbjm8vb52mh1a9js7";
   };
 
   id = deriv {
     lang = "id";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-id-4.4.4.tar.bz2";
-    sha256 = "1rrqzgz58hshf7s01xp335bxpc28vsgkd18wcl0v69hf4gh36fa3";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-id-4.4.5.tar.bz2";
+    sha256 = "1ds4ncfb4xp0bd0dijichgp289abhm10f285bwnanzzjn442i4x6";
   };
 
   is = deriv {
     lang = "is";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-is-4.4.4.tar.bz2";
-    sha256 = "01lkvaffpxv8ba8z6csxqb1kqxqj5r1idxw4qxbqw7dj8cjqj3d2";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-is-4.4.5.tar.bz2";
+    sha256 = "07xx45wy1n5kqg6fwdl27w1kpvqs6djj6yv6lxq2vbh5di3h5zpj";
   };
 
   it = deriv {
     lang = "it";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-it-4.4.4.tar.bz2";
-    sha256 = "0bfjk9lhwls9gyiy0ify3hr5jqjy5wcnlbh44mzf78c3y8snngga";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-it-4.4.5.tar.bz2";
+    sha256 = "1agl195pkxh55669gmcnd97z3bd9ff1c448d8rnq2rqr0xysj1mr";
   };
 
   ja = deriv {
     lang = "ja";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ja-4.4.4.tar.bz2";
-    sha256 = "06j5ksv1660hd7bp9q942igi6wm47a4w6grx2q6lbvxc41ms5wk4";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-ja-4.4.5.tar.bz2";
+    sha256 = "0axra17rpv5hdr83yvd0n3kgp51frkf5b5kfg1bg7sf44kn9fhv5";
   };
 
   kk = deriv {
     lang = "kk";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-kk-4.4.4.tar.bz2";
-    sha256 = "0vm5l5xrs1x9jy9zkjf43xfnxi2wc366j9y797pp04mh5rgdd2vv";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-kk-4.4.5.tar.bz2";
+    sha256 = "1gkli53ryfbb64b9x2fl76cid98m99lxszn0cczfmfdvjlc0vgxr";
   };
 
   km = deriv {
     lang = "km";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-km-4.4.4.tar.bz2";
-    sha256 = "0ihzc62wkhindzl2fawcmvk87wbnbdm4f09pr092n6w2l8k8wz9b";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-km-4.4.5.tar.bz2";
+    sha256 = "0113z5560zsjr9jrgh58nch9h4xlqclld2zqc8yah90i7jpas3aq";
   };
 
   kn = deriv {
     lang = "kn";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-kn-4.4.4.tar.bz2";
-    sha256 = "15xxpb6c6g1v9girss9aimcbszdbq4ccsbq396hfn46kzxybzhjh";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-kn-4.4.5.tar.bz2";
+    sha256 = "0m6gz9sl21hfnpk3z8y33aqfv17z1x1b8j24jf88qvl01nsk4889";
   };
 
   ko = deriv {
     lang = "ko";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ko-4.4.4.tar.bz2";
-    sha256 = "0fzgyqajhjmlr9ibbd4jri00ccjji7m9bg02dw739w4rkvn5k6j1";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-ko-4.4.5.tar.bz2";
+    sha256 = "0j30rj155fcd0wmbkbbwm2vybb9x3g6dq3mipmf1zipm1nm7m64l";
   };
 
   lt = deriv {
     lang = "lt";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-lt-4.4.4.tar.bz2";
-    sha256 = "126nnk3c1rkfhpy1nbsxkhad6bazbv6x9bh6kpqd9clwh8k35ya4";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-lt-4.4.5.tar.bz2";
+    sha256 = "10swp16mab3kh393dcwn1k9qm5jrcqigixrw39hlbsyaw9jf9j37";
   };
 
   lv = deriv {
     lang = "lv";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-lv-4.4.4.tar.bz2";
-    sha256 = "1n4szkfmyrzh6x3a85byzpn53lp8d4m0abp8k5kn2iksxh9z5mkl";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-lv-4.4.5.tar.bz2";
+    sha256 = "0niyc9awcdfnx3gi63vw83ni1nb870384f4wyhmms8zdkvca5hjc";
   };
 
   mai = deriv {
     lang = "mai";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-mai-4.4.4.tar.bz2";
-    sha256 = "0r65y0vxjbl9ghl7mg4dg58w0rbrlbhrllc6cyvv32xwjbi0qc3c";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-mai-4.4.5.tar.bz2";
+    sha256 = "1clmcpqj4m7mwf2v62500jqjb94gpmlzxjp3cflraf9w4nmvv66a";
   };
 
   mk = deriv {
     lang = "mk";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-mk-4.4.4.tar.bz2";
-    sha256 = "05whf03nlklz63qkgzmg6f7phj128q0lxyqbwvdnrv20v5pbld65";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-mk-4.4.5.tar.bz2";
+    sha256 = "09gbk50bw7d8hpj0jwyz0wzd34fq7h9r35vj6750vpv7pbyz4l7q";
   };
 
   ml = deriv {
     lang = "ml";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ml-4.4.4.tar.bz2";
-    sha256 = "1c572ygyhdnb3dl464v9zg6nb3l533qpkv4a54v7afswy6n61cil";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-ml-4.4.5.tar.bz2";
+    sha256 = "1bsr4civp003wgnpl790z5cfh1rayn7xc6lvvrpk4hrcr2b5skj9";
   };
 
   nb = deriv {
     lang = "nb";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-nb-4.4.4.tar.bz2";
-    sha256 = "0zl9m90arm5dn1nmapm5ignrx4pm46vyiid0p100id59yjwpk3a9";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-nb-4.4.5.tar.bz2";
+    sha256 = "1i9chazhp0s22rva0swkvd7zpl5my6pbgckn5fj924fkbs6336jl";
   };
 
   nds = deriv {
     lang = "nds";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-nds-4.4.4.tar.bz2";
-    sha256 = "1cx54i2xl3zwlkq83xs1q0siap0hddqd4c4s0nqwgwp78vg9x0mw";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-nds-4.4.5.tar.bz2";
+    sha256 = "0kyn8mn8jm03sd56q6hm884ywshl5i6wy9vmskaqpclp9y6xbwlc";
   };
 
   nl = deriv {
     lang = "nl";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-nl-4.4.4.tar.bz2";
-    sha256 = "0ydkr8ywkkndaik1l6v860zq6mfgdw8l8n0rgjkhs6ikvyd4gk5d";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-nl-4.4.5.tar.bz2";
+    sha256 = "0fnssviivx8xdg9vq5iy44al6dz82mg3p41ngkyghh25xfm0iswr";
   };
 
   nn = deriv {
     lang = "nn";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-nn-4.4.4.tar.bz2";
-    sha256 = "0vb5fgjkn0jcwsb173gwrr5kr5ihi885g09fb7j92dbpdp1fk4gc";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-nn-4.4.5.tar.bz2";
+    sha256 = "0mfr3jqx1nrd3gf4319c29f3hhks9b2hn7r6bidwsmipar8b3pgd";
   };
 
   pa = deriv {
     lang = "pa";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-pa-4.4.4.tar.bz2";
-    sha256 = "0jn94b9f3bb7gv5anprcghmhn1wj6vzv8biflqzqk7bx6q07k70d";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-pa-4.4.5.tar.bz2";
+    sha256 = "0aciihaprzndn5j4d8dsc2b13sq1xac89j6r0assbvhgmix06844";
   };
 
   pl = deriv {
     lang = "pl";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-pl-4.4.4.tar.bz2";
-    sha256 = "0p4hd5g2wkqahg79l9n2x7xy647kbf14jz00p8wpbxnbd2hvp333";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-pl-4.4.5.tar.bz2";
+    sha256 = "1xq63d020k8fyqc0akpm3kvqrvg2g91r679ny51n13xmdcq59y1f";
   };
 
   pt = deriv {
     lang = "pt";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-pt-4.4.4.tar.bz2";
-    sha256 = "0b0hk7sps0967dn4ryj43ihmbg3glspxd88f77z8ydccxi9zma2k";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-pt-4.4.5.tar.bz2";
+    sha256 = "0bkmw9rs7wzlycvih0ma97a3n1ly4x8cyv5c682rf3ykvnmkv1n1";
   };
 
   pt_BR = deriv {
     lang = "pt_BR";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-pt_BR-4.4.4.tar.bz2";
-    sha256 = "1b9iy2mcm3l825kclrbs7sdsvgg5phi37aby3az8f25vh6mk80w9";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-pt_BR-4.4.5.tar.bz2";
+    sha256 = "1c4y5d7s2yvydnr0dmgnr0g871mblvkx0higzwivknd54nzf6fba";
   };
 
   ro = deriv {
     lang = "ro";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ro-4.4.4.tar.bz2";
-    sha256 = "0da5awwls7h3pngq66gab420wlvmjj20pa5zhlmk2y1xdv917ysd";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-ro-4.4.5.tar.bz2";
+    sha256 = "1lmz85a011m0f0cq7pj4ni2q3p3dzqqbgmii63hrn29ss4kvvkyw";
   };
 
   ru = deriv {
     lang = "ru";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-ru-4.4.4.tar.bz2";
-    sha256 = "0dxs3dzg80vw5gqs8gfj9hkrvh10qm55gjzxj12ks1nwlq5j39wp";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-ru-4.4.5.tar.bz2";
+    sha256 = "09ywm943k2v0cj3a82wrayi05m4gx2vvjff37v5hj4fxxw8785sv";
   };
 
   si = deriv {
     lang = "si";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-si-4.4.4.tar.bz2";
-    sha256 = "14qppy24c4h7d96b0pc3m1jahkzpd1gxidrpi3cnvniw3qidr88n";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-si-4.4.5.tar.bz2";
+    sha256 = "0x3c9qp2crfghws0dckhjgjs3znvbj1pzllipj587snj2m43a1m8";
   };
 
   sk = deriv {
     lang = "sk";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-sk-4.4.4.tar.bz2";
-    sha256 = "1vf5dz45nqzg3cdwny9v59nwx0ja25bvwcrhrlqm7q4xl7g8iz8p";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-sk-4.4.5.tar.bz2";
+    sha256 = "11dl6g4gyf62sxgxa1mpd6j78alkavsvqbjs46pv4jzl0c6z586z";
   };
 
   sl = deriv {
     lang = "sl";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-sl-4.4.4.tar.bz2";
-    sha256 = "0nvp20hwdpci4gfdgag6j32dvm7a9j21x3kcvs4saals7gfqy1bh";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-sl-4.4.5.tar.bz2";
+    sha256 = "1p73g5bgyfzkfk8z6fi3kp2zs9hax4hwsf526hzs73v3z9prki9d";
   };
 
   sr = deriv {
     lang = "sr";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-sr-4.4.4.tar.bz2";
-    sha256 = "0mw9b6bvgp6mfgzcjx9ircqajna7zf1k2wrp61l0v2cipj4apj5b";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-sr-4.4.5.tar.bz2";
+    sha256 = "1db60arnzpn9ca3zjnvfgx2sr5dw49w6z7ff6knpi88kzalv1w1i";
   };
 
   sv = deriv {
     lang = "sv";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-sv-4.4.4.tar.bz2";
-    sha256 = "1sp500d8r7zxql4k0jbavxng6vhwcplvkzfwcvrgvq9326mn5x29";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-sv-4.4.5.tar.bz2";
+    sha256 = "1ilpfca451xy6ls86l1pvd7srs3075h70kysyn1q4h9j18gfy03q";
   };
 
   tg = deriv {
     lang = "tg";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-tg-4.4.4.tar.bz2";
-    sha256 = "0abfl8y4m2y8nk46445376g55xsb51rzjg4jsqzzz6xqmxnhkz79";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-tg-4.4.5.tar.bz2";
+    sha256 = "0a0rvjqlvlzd99k1c04qmhkwg5814qcnjanx4dryqj5ridv2l2k1";
   };
 
   tr = deriv {
     lang = "tr";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-tr-4.4.4.tar.bz2";
-    sha256 = "00kgm1a9q5jx6cq3flvrnasj1lwgcqf2kac6wa7qlqpy4nqw2vfm";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-tr-4.4.5.tar.bz2";
+    sha256 = "1im41dvwrf9bhk3yqprxbzjz7ark1kpc3bbix49c6fbmgkvfn2h5";
   };
 
   uk = deriv {
     lang = "uk";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-uk-4.4.4.tar.bz2";
-    sha256 = "0l1r2xphq8rlnjf0hqdplsk47a35p6sxvdp9g9vg26gfhd7156zq";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-uk-4.4.5.tar.bz2";
+    sha256 = "1ik51g3bgj4vvy3wzdnm7p2liwrkk3nrszydl7j2024fzj2vfyd2";
   };
 
   wa = deriv {
     lang = "wa";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-wa-4.4.4.tar.bz2";
-    sha256 = "17yijs2mk7sr87lms7wajvxxrf888gbz75z9fza6kp6mlvbjc1a0";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-wa-4.4.5.tar.bz2";
+    sha256 = "0mcv8rf54vxfq8ql4h8b573xdlw9x6j740zq7ki1qscvgrcj03g0";
   };
 
   zh_CN = deriv {
     lang = "zh_CN";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-zh_CN-4.4.4.tar.bz2";
-    sha256 = "1qjr3jlr539lm2mkgn2bma98zdy91frih2bfzl1jxrdp0swnkzh5";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-zh_CN-4.4.5.tar.bz2";
+    sha256 = "0w42x6dwnhz8668smgk3ld8bb7dvx60py4q7fj50qmipkb8vwh20";
   };
 
   zh_TW = deriv {
     lang = "zh_TW";
-    url = "mirror://kde/stable/4.4.4/src/kde-l10n/kde-l10n-zh_TW-4.4.4.tar.bz2";
-    sha256 = "1s6dg6imqjb4wxljd1jblwp6kqkzcnybhndfbzhsb691ivi42mh5";
+    url = "mirror://kde/stable/4.4.5/src/kde-l10n/kde-l10n-zh_TW-4.4.5.tar.bz2";
+    sha256 = "19hvc57s37kpby1hjy6w5xi37a9n23rfxb53aj2lvdbar8ac9lci";
   };
 
 }
diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix
index fd4a3138c4e..46bc0a08e0b 100644
--- a/pkgs/desktops/kde-4.4/libs/default.nix
+++ b/pkgs/desktops/kde-4.4/libs/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "kdelibs-4.4.4";
+  name = "kdelibs-4.4.5";
 
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdelibs-4.4.4.tar.bz2;
-    sha256 = "1jwvdzgmb3kjb57yqxn8iybm5ywfb4qzf8l7fpnab2xyn73a023g";
+    url = mirror://kde/stable/4.4.5/src/kdelibs-4.4.5.tar.bz2;
+    sha256 = "11b0iif35bn8izr94590bgxkyy8ri572mjqlajzh988bww1r5mqi";
   };
 
   buildInputs = [
diff --git a/pkgs/desktops/kde-4.4/multimedia/default.nix b/pkgs/desktops/kde-4.4/multimedia/default.nix
index 0fb57896c52..7201ed93e1a 100644
--- a/pkgs/desktops/kde-4.4/multimedia/default.nix
+++ b/pkgs/desktops/kde-4.4/multimedia/default.nix
@@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdemultimedia-4.4.4";
+  name = "kdemultimedia-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdemultimedia-4.4.4.tar.bz2;
-    sha256 = "1cvin5cwzp6z9x2sgjnwqd328m60qn508z9xka9v8zxgbmays3cc";
+    url = mirror://kde/stable/4.4.5/src/kdemultimedia-4.4.5.tar.bz2;
+    sha256 = "186la58w7572s47yrs01q3qk0ffiqn9357a6gdk8263x9myc2xkz";
   };
   buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame
                   kdelibs automoc4 phonon ];
diff --git a/pkgs/desktops/kde-4.4/network/default.nix b/pkgs/desktops/kde-4.4/network/default.nix
index 92a6a041bb8..d6191b9ce4c 100644
--- a/pkgs/desktops/kde-4.4/network/default.nix
+++ b/pkgs/desktops/kde-4.4/network/default.nix
@@ -4,10 +4,10 @@
 , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
 
 stdenv.mkDerivation {
-  name = "kdenetwork-4.4.4";
+  name = "kdenetwork-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdenetwork-4.4.4.tar.bz2;
-    sha256 = "13aqgr59wm3iackifymd0vmhwd8p998al2bzalvviz5ganmxzyps";
+    url = mirror://kde/stable/4.4.5/src/kdenetwork-4.4.5.tar.bz2;
+    sha256 = "1rpf5kmcc3cw7vlj9g8px19b5vr4hnza8r78bw1g8i7vwcng57ya";
   };
   buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
                   libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l
diff --git a/pkgs/desktops/kde-4.4/oxygen-icons/default.nix b/pkgs/desktops/kde-4.4/oxygen-icons/default.nix
index 887466535cf..52c775bd8dc 100644
--- a/pkgs/desktops/kde-4.4/oxygen-icons/default.nix
+++ b/pkgs/desktops/kde-4.4/oxygen-icons/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake}:
 
 stdenv.mkDerivation {
-  name = "oxygen-icons-4.4.4";
+  name = "oxygen-icons-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/oxygen-icons-4.4.4.tar.bz2;
-    sha256 = "103001rxixpm4gb0bwdqvm9j1ygfjm25r11gz73hvyqss2v22zh4";
+    url = mirror://kde/stable/4.4.5/src/oxygen-icons-4.4.5.tar.bz2;
+    sha256 = "15nfh8zl54a7b3pyqjiabv82srkp7c8gl9fpsy9ydw742lvs0pr7";
   };
   buildInputs = [ cmake ];
   meta = {
diff --git a/pkgs/desktops/kde-4.4/pim-runtime/default.nix b/pkgs/desktops/kde-4.4/pim-runtime/default.nix
index c3a851f3608..02f0a55838c 100644
--- a/pkgs/desktops/kde-4.4/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.4/pim-runtime/default.nix
@@ -3,10 +3,10 @@
 , automoc4, phonon, akonadi, soprano, strigi}:
 
 stdenv.mkDerivation {
-  name = "kdepim-runtime-4.4.4";
+  name = "kdepim-runtime-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdepim-runtime-4.4.4.tar.bz2;
-    sha256 = "1ibpc6xmcn0gvzy4fywipc1z1dpwj256aijm4a56xkz0m9xayw9h";
+    url = mirror://kde/stable/4.4.5/src/kdepim-runtime-4.4.5.tar.bz2;
+    sha256 = "1yisz7vfj51l4hs4f0ry0shas5r7m7p0iqr1458yasad9icq94j7";
   };
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
                   kdelibs kdepimlibs
diff --git a/pkgs/desktops/kde-4.4/pim/default.nix b/pkgs/desktops/kde-4.4/pim/default.nix
index 93c84fdc86d..adb2f1932bb 100644
--- a/pkgs/desktops/kde-4.4/pim/default.nix
+++ b/pkgs/desktops/kde-4.4/pim/default.nix
@@ -3,10 +3,10 @@
 , kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdepim-4.4.4";
+  name = "kdepim-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdepim-4.4.4.tar.bz2;
-    sha256 = "0632b78r40kjazlk0g78a7k8v8ql3bcin85nr1g7frxllmqk9vjv";
+    url = mirror://kde/stable/4.4.5/src/kdepim-4.4.5.tar.bz2;
+    sha256 = "0n95wjk1ly7zfn9wv589a9hrc0r7wvik7jrvsgimnxr0rapxk3bp";
   };
   builder = ./builder.sh;  
   buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
diff --git a/pkgs/desktops/kde-4.4/pimlibs/default.nix b/pkgs/desktops/kde-4.4/pimlibs/default.nix
index 30ba3eef89b..040148066e8 100644
--- a/pkgs/desktops/kde-4.4/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.4/pimlibs/default.nix
@@ -2,10 +2,10 @@
 , kdelibs, automoc4, phonon, akonadi}:
 
 stdenv.mkDerivation {
-  name = "kdepimlibs-4.4.4";
+  name = "kdepimlibs-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdepimlibs-4.4.4.tar.bz2;
-    sha256 = "013xqj7jljz20n412g3s4rzjn1ax774wvrqs9p5zi5kjycfndfpf";
+    url = mirror://kde/stable/4.4.5/src/kdepimlibs-4.4.5.tar.bz2;
+    sha256 = "06ibdg8cxhc9p4ywxa8f7kb0bnv0789qiapifvdfdr3zc8m0nj24";
   };
   buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap shared_mime_info
                   kdelibs automoc4 phonon akonadi ];
diff --git a/pkgs/desktops/kde-4.4/plasma-addons/default.nix b/pkgs/desktops/kde-4.4/plasma-addons/default.nix
index 8f4839ea6a6..a80641d88d5 100644
--- a/pkgs/desktops/kde-4.4/plasma-addons/default.nix
+++ b/pkgs/desktops/kde-4.4/plasma-addons/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, python, shared_mime_info, libXtst, libXi
 , kdelibs, kdebase_workspace, kdepimlibs, kdebase, kdegraphics, kdeedu
-, automoc4, phonon, soprano, eigen, qimageblitz, attica}:
+, automoc4, phonon, soprano, eigen, qimageblitz, attica, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdeplasma-addons-4.4.4";
+  name = "kdeplasma-addons-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdeplasma-addons-4.4.4.tar.bz2;
-    sha256 = "0pmll98l9d1yh8yfsfqd970bs346xkfi2h4a6vxmm643xsr59d2d";
+    url = mirror://kde/stable/4.4.5/src/kdeplasma-addons-4.4.5.tar.bz2;
+    sha256 = "1wrgnfag4bn27kii3rzrzadw0xc869miml0kxsxcj9ryqppxbfxd";
   };
   inherit kdebase_workspace;
   builder = ./builder.sh;
   KDEDIRS="${kdeedu}";
   buildInputs = [ cmake qt4 perl python shared_mime_info libXtst libXi
                   kdelibs kdebase_workspace kdepimlibs kdebase kdegraphics kdeedu
-		  automoc4 phonon soprano eigen qimageblitz attica ];
+		  automoc4 qca2 phonon soprano eigen qimageblitz attica ];
   meta = {
     description = "KDE Plasma Addons";
     license = "GPL";
diff --git a/pkgs/desktops/kde-4.4/sdk/default.nix b/pkgs/desktops/kde-4.4/sdk/default.nix
index 5b069b641e2..99b180f6a3d 100644
--- a/pkgs/desktops/kde-4.4/sdk/default.nix
+++ b/pkgs/desktops/kde-4.4/sdk/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr, aprutil
-, shared_mime_info
+{ stdenv, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, subversion, apr, aprutil
+, shared_mime_info, hunspell
 , kdelibs, kdepimlibs, automoc4, phonon, strigi}:
 
 stdenv.mkDerivation {
-  name = "kdesdk-4.4.4";
+  name = "kdesdk-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdesdk-4.4.4.tar.bz2;
-    sha256 = "18ncywimkg5iy58wsgqarx2s1w63xcxxspzxwcxsp46wia80wfr3";
+    url = mirror://kde/stable/4.4.5/src/kdesdk-4.4.5.tar.bz2;
+    sha256 = "0ykj09ln8rqdsjrix21j4yghzx6rkfkca4q3133sp7h8y56plqrw";
   };
   builder=./builder.sh;
   inherit aprutil;
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion apr aprutil shared_mime_info
-                  kdelibs kdepimlibs automoc4 phonon strigi ];
-  meta = {
+                  kdelibs kdepimlibs automoc4 phonon strigi hunspell];
+  meta = with stdenv.lib; {
     description = "KDE SDK";
     longDescription = "Contains various development utilities such as the Umbrello UML modeler and Cerivisia CVS front-end";
     license = "GPL";
     homepage = http://www.kde.org;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ maintainers.sander maintainers.urkud ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/kde-4.4/support/akonadi/default.nix b/pkgs/desktops/kde-4.4/support/akonadi/default.nix
index 8e0db47ac7a..1f00d0461b9 100644
--- a/pkgs/desktops/kde-4.4/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.4/support/akonadi/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, lib, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
+{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
 
-stdenv.mkDerivation {
-  name = "akonadi-1.3.1";
+stdenv.mkDerivation rec {
+  name = "akonadi-1.3.85";
   src = fetchurl {
-    url = http://download.akonadi-project.org/akonadi-1.3.1.tar.bz2;
-    sha256 = "1pbn6sviipxxpx80cspncfc3nlz047nryfbv8xzfz5811p19k7jb";
+    url = "http://download.akonadi-project.org/${name}.tar.bz2";
+    sha256 = "1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck";
   };
-  includeAllQtDirs=true;
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
-  meta = {
+  meta = with stdenv.lib; {
     description = "KDE PIM Storage Service";
     license = "LGPL";
     homepage = http://pim.kde.org/akonadi;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ maintainers.sander maintainers.urkud ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/kde-4.4/support/attica/default.nix b/pkgs/desktops/kde-4.4/support/attica/default.nix
index fa4c5791009..5c62f34efb2 100644
--- a/pkgs/desktops/kde-4.4/support/attica/default.nix
+++ b/pkgs/desktops/kde-4.4/support/attica/default.nix
@@ -1,15 +1,16 @@
 {stdenv, fetchurl, cmake, qt4}:
 
-stdenv.mkDerivation {
-  name = "attica-0.1.2";
+stdenv.mkDerivation rec {
+  name = "attica-0.1.4";
   src = fetchurl {
-    url = mirror://kde/stable/attica/attica-0.1.2.tar.bz2;
-    sha256 = "09k7ghphqzfdlnsj61396sgmyzjqz9l6a8703y29292yc4h7qmxh";
+    url = "mirror://kde/stable/attica/${name}.tar.bz2";
+    sha256 = "0frarnrnbli3f5ji90swgw05g88w1f5777ais345wc8lkvqg9ix1";
   };
   buildInputs = [ cmake qt4 ];
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library to access Open Collaboration Service providers";
     license = "LGPL";
-    maintainers = [ stdenv.lib.maintainers.sander ];
+    maintainers = [ maintainers.sander maintainers.urkud ];
+    platforms = qt4.meta.platforms;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/desktops/kde-4.4/support/eigen/default.nix b/pkgs/desktops/kde-4.4/support/eigen/default.nix
index 3b15e804e73..e78a27af19c 100644
--- a/pkgs/desktops/kde-4.4/support/eigen/default.nix
+++ b/pkgs/desktops/kde-4.4/support/eigen/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake}:
 
 stdenv.mkDerivation {
-  name = "eigen-2.0.11";
+  name = "eigen-2.0.15";
   src = fetchurl {
-    url = http://bitbucket.org/eigen/eigen/get/2.0.11.tar.bz2;
-    sha256 = "0zlv6isqhz0krzh77h8xiy1sglig7j17135qnna0gar0fa6kcj7l";
+    url = http://bitbucket.org/eigen/eigen/get/2.0.15.tar.bz2;
+    sha256 = "1a00hqyig4rc7nkz97xv23q7k0vdkzvgd0jkayk61fn9aqcrky79";
   };
   buildInputs = [ cmake ];  
   meta = {
diff --git a/pkgs/desktops/kde-4.4/support/phonon/default.nix b/pkgs/desktops/kde-4.4/support/phonon/default.nix
index 437e2fc40c1..7023e4ca490 100644
--- a/pkgs/desktops/kde-4.4/support/phonon/default.nix
+++ b/pkgs/desktops/kde-4.4/support/phonon/default.nix
@@ -3,7 +3,7 @@
 , gstreamer, gstPluginsBase, xineLib, pulseaudio}:
 
 let
-  v = "4.4.1";
+  v = "4.4.2";
   stable = true;
 in
 
@@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
   name = "phonon-${v}";
   src = fetchurl {
     url = "mirror://kde/${if stable then "" else "un"}stable/phonon/${v}/${name}.tar.bz2";
-    sha256 = "0xsjbvpiqrsmqvxmhmjkwyhcxkajf1f78pg67kfwidaz9kkv0lla";
+    sha256 = "11ilv692yqzvk93y3n2zp9qvqc2xi0npz8vbqa1b60b268zlqh7i";
   };
-  patches = [ ./phonon-4.4.1-gst-plugins-include.patch ];
   buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gstreamer
     gstPluginsBase xineLib automoc4 pulseaudio pkgconfig ];
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/kde-4.4/support/soprano/default.nix b/pkgs/desktops/kde-4.4/support/soprano/default.nix
index f8610093f2c..938fa05f2c1 100644
--- a/pkgs/desktops/kde-4.4/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.4/support/soprano/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland, libiodbc}:
 
 stdenv.mkDerivation rec {
-  name = "soprano-2.4.1";
+  name = "soprano-2.4.4";
   
   src = fetchurl {
     url = "mirror://sf/soprano/${name}.tar.bz2";
-    sha256 = "1ghwjbcrbwhq0in61a47iaxcja50r9axsg9cv97x2myprrqa43bj";
+    sha256 = "02qi616w6kli75ibkrvjc88spx6hi8ahlf3c926bi4lh5h73pjkq";
   };
   
   # We disable the Java backends, since we do not need them and they make the closure size much bigger
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
     description = "An object-oriented C++/Qt4 framework for RDF data";
     license = "LGPL";
     maintainers = with lib.maintainers; [ sander urkud ];
+    platforms = qt4.meta.platforms;
   };
 }
diff --git a/pkgs/desktops/kde-4.4/toys/default.nix b/pkgs/desktops/kde-4.4/toys/default.nix
index 948b22cc016..4c4a3e582df 100644
--- a/pkgs/desktops/kde-4.4/toys/default.nix
+++ b/pkgs/desktops/kde-4.4/toys/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdetoys-4.4.4";
+  name = "kdetoys-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdetoys-4.4.4.tar.bz2;
-    sha256 = "16q5fyvl3j3n6f90kw172rz12m3rf6si3wka3wpgbzz3dcl8hda8";
+    url = mirror://kde/stable/4.4.5/src/kdetoys-4.4.5.tar.bz2;
+    sha256 = "0cydhkgx2aqn2z0hjd7kg0da18niq89xixfhc7sq4g92xc9fryq1";
   };
   buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ];
   meta = {
diff --git a/pkgs/desktops/kde-4.4/utils/default.nix b/pkgs/desktops/kde-4.4/utils/default.nix
index 75c837bd065..ade60e1b55e 100644
--- a/pkgs/desktops/kde-4.4/utils/default.nix
+++ b/pkgs/desktops/kde-4.4/utils/default.nix
@@ -3,11 +3,11 @@
 , kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}:
 
 stdenv.mkDerivation {
-  name = "kdeutils-4.4.4";
+  name = "kdeutils-4.4.5";
   
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdeutils-4.4.4.tar.bz2;
-    sha256 = "1vdpa360wmk6gr84xgmpfyjzf2l5dsxacyq29c6dmg6n7cziq85c";
+    url = mirror://kde/stable/4.4.5/src/kdeutils-4.4.5.tar.bz2;
+    sha256 = "159464yv5l0ra6h7l2ihfc3i4sr62229837zi6n9x4bfmd5pvvq7";
   };
   
   builder = ./builder.sh;
diff --git a/pkgs/desktops/kde-4.4/webdev/default.nix b/pkgs/desktops/kde-4.4/webdev/default.nix
index 3968318079f..de66879a0d0 100644
--- a/pkgs/desktops/kde-4.4/webdev/default.nix
+++ b/pkgs/desktops/kde-4.4/webdev/default.nix
@@ -2,10 +2,10 @@
 , kdelibs, kdepimlibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kdewebdev-4.4.4";
+  name = "kdewebdev-4.4.5";
   src = fetchurl {
-    url = mirror://kde/stable/4.4.4/src/kdewebdev-4.4.4.tar.bz2;
-    sha256 = "1jdc55kvv8kr9s05iyp94cl7n7lsph9flyn499jvzbxd6lq366zi";
+    url = mirror://kde/stable/4.4.5/src/kdewebdev-4.4.5.tar.bz2;
+    sha256 = "1yqn08xlzbcqrna76wqjmp58x28n3k47705znzqvh951ljdxds85";
   };
   buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];
   meta = {
diff --git a/pkgs/desktops/kde-4.5/support/akonadi/default.nix b/pkgs/desktops/kde-4.5/support/akonadi/default.nix
new file mode 100644
index 00000000000..1f00d0461b9
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/akonadi/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
+
+stdenv.mkDerivation rec {
+  name = "akonadi-1.3.85";
+  src = fetchurl {
+    url = "http://download.akonadi-project.org/${name}.tar.bz2";
+    sha256 = "1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck";
+  };
+  buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
+  meta = with stdenv.lib; {
+    description = "KDE PIM Storage Service";
+    license = "LGPL";
+    homepage = http://pim.kde.org/akonadi;
+    maintainers = [ maintainers.sander maintainers.urkud ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/support/attica/default.nix b/pkgs/desktops/kde-4.5/support/attica/default.nix
new file mode 100644
index 00000000000..5c62f34efb2
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/attica/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, cmake, qt4}:
+
+stdenv.mkDerivation rec {
+  name = "attica-0.1.4";
+  src = fetchurl {
+    url = "mirror://kde/stable/attica/${name}.tar.bz2";
+    sha256 = "0frarnrnbli3f5ji90swgw05g88w1f5777ais345wc8lkvqg9ix1";
+  };
+  buildInputs = [ cmake qt4 ];
+  meta = with stdenv.lib; {
+    description = "A library to access Open Collaboration Service providers";
+    license = "LGPL";
+    maintainers = [ maintainers.sander maintainers.urkud ];
+    platforms = qt4.meta.platforms;
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/support/automoc4/default.nix b/pkgs/desktops/kde-4.5/support/automoc4/default.nix
new file mode 100644
index 00000000000..bd6c5c3b149
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/automoc4/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, lib, cmake, qt4}:
+
+stdenv.mkDerivation {
+  name = "automoc4-0.9.88";
+  src = fetchurl {
+    url = mirror://kde/stable/automoc4/0.9.88/automoc4-0.9.88.tar.bz2;
+    md5 = "91bf517cb940109180ecd07bc90c69ec";
+  };
+  buildInputs = [ cmake qt4 ];
+  meta = {
+    description = "KDE Meta Object Compiler";
+    license = "BSD";
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/support/eigen/default.nix b/pkgs/desktops/kde-4.5/support/eigen/default.nix
new file mode 100644
index 00000000000..30a47d1d041
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/eigen/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, lib, cmake}:
+
+let
+  v = "2.0.14";
+in
+stdenv.mkDerivation {
+  name = "eigen-${v}";
+  src = fetchurl {
+    url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
+    name = "eigen-${v}.tar.bz2";
+    sha256 = "01xkdqs6hqkwcq5yzpdz79da0i512s818pbg8fl9w3m2vvndzs6p";
+  };
+  buildInputs = [ cmake ];
+  meta = {
+    description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
+    license = "LGPL";
+    homepage = http://eigen.tuxfamily.org ;
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/support/phonon/default.nix b/pkgs/desktops/kde-4.5/support/phonon/default.nix
new file mode 100644
index 00000000000..7023e4ca490
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/phonon/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, cmake, qt4, automoc4, pkgconfig
+, libXau, libXdmcp, libpthreadstubs
+, gstreamer, gstPluginsBase, xineLib, pulseaudio}:
+
+let
+  v = "4.4.2";
+  stable = true;
+in
+
+stdenv.mkDerivation rec {
+  name = "phonon-${v}";
+  src = fetchurl {
+    url = "mirror://kde/${if stable then "" else "un"}stable/phonon/${v}/${name}.tar.bz2";
+    sha256 = "11ilv692yqzvk93y3n2zp9qvqc2xi0npz8vbqa1b60b268zlqh7i";
+  };
+  buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gstreamer
+    gstPluginsBase xineLib automoc4 pulseaudio pkgconfig ];
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    description = "KDE Multimedia API";
+    longDescription = "KDE Multimedia API which abstracts over various backends such as GStreamer and Xine";
+    license = "LGPL";
+    homepage = http://phonon.kde.org;
+    maintainers = [ maintainers.sander maintainers.urkud ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/support/qca2/default.nix b/pkgs/desktops/kde-4.5/support/qca2/default.nix
new file mode 100644
index 00000000000..ceff834e95b
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/qca2/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, lib, which, qt4}:
+
+stdenv.mkDerivation {
+  name = "qca-2.0.2";
+  src = fetchurl {
+    url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2;
+    sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
+  };
+  buildInputs = [ which qt4 ];
+  meta = {
+    description = "Qt Cryptographic Architecture";
+    license = "LGPL";
+    homepage = http://delta.affinix.com/qca;
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/support/qca2/ossl-remove-whirlpool.patch b/pkgs/desktops/kde-4.5/support/qca2/ossl-remove-whirlpool.patch
new file mode 100644
index 00000000000..fa4eb401622
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/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 <infiniti@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
+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 <infiniti@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
+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.5/support/qca2/ossl.nix b/pkgs/desktops/kde-4.5/support/qca2/ossl.nix
new file mode 100644
index 00000000000..be992eb42ea
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/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/lib/qt4/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 ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/support/soprano/default.nix b/pkgs/desktops/kde-4.5/support/soprano/default.nix
new file mode 100644
index 00000000000..8d935b42299
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/soprano/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland, libiodbc}:
+
+stdenv.mkDerivation rec {
+  name = "soprano-2.4.63";
+
+  src = fetchurl {
+    url = "mirror://sf/soprano/${name}.tar.bz2";
+    sha256 = "0iqs0dy5d0pgf2x3vpigwvs8vp7mvfvzimkdw7dvqlqbbld05qbf";
+  };
+
+  # We disable the Java backend, since we do not need them and they make the closure size much bigger
+  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 = with lib.maintainers; [ sander urkud ];
+    platforms = qt4.meta.platforms;
+  };
+}
diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix
index dc209bd6ddb..779aa48c2d0 100644
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix
@@ -1,14 +1,15 @@
-args: with args;
+{ stdenv, fetchurl, unzip }:
+
 stdenv.mkDerivation rec {
-  name = "adobe_flex_sdk_3.4.1.10084_mpl";
+  name = "adobe-flex-sdk-4.0.0.14159-mpl";
 
   src = fetchurl {
     # This is the open source distribution
-    url = http://fpdownload.adobe.com/pub/flex/sdk/builds/flex3/flex_sdk_3.4.1.10084_mpl.zip;
-    sha256 = "0bq0cnq25qyr3g64sqqc20y3mmnhgh07p3ylxd2iq0ha8cdis7z0";
+    url = http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4/flex_sdk_4.0.0.14159_mpl.zip;
+    sha256 = "1x12sji6g42bm1h7jndkda5vpah6vnkpc13qwq0c4xvbsh8757v5";
   };
 
-  phases="installPhase";
+  phases = "installPhase";
 
   buildInputs = [ unzip ];
 
@@ -32,8 +33,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = { 
-      description = "flex sdk flash / action script developement kit";
-      homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation";
-      license = "MPLv1.1"; #  Mozilla Public License Version 1.1
+    description = "flex sdk flash / action script developement kit";
+    homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation";
+    license = "MPLv1.1"; #  Mozilla Public License Version 1.1
   };
 }
diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix
index fadc73c051e..88f0ab91067 100644
--- a/pkgs/development/compilers/fpc/binary.nix
+++ b/pkgs/development/compilers/fpc/binary.nix
@@ -1,19 +1,20 @@
-args: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "fpc-2.4.0-binary";
 
-  src = if stdenv.system == "i686-linux" then
-  fetchurl {
-    url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar";
-    sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv";
-  }
-  else if stdenv.system == "x86_64-linux" then
-  fetchurl {
-    url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar";
-    sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z";
-  }
-  else null;
+  src =
+    if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar";
+        sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv";
+      }
+    else if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar";
+        sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z";
+      }
+    else throw "Not supported on ${stdenv.system}.";
 
   builder = ./binary-builder.sh;
 
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index ce1f101b4f5..ee2aa27a621 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -1,8 +1,6 @@
-args:
+{ stdenv, fetchurl, gawk }:
 
-if args ? startFPC && args.startFPC != null then
-
-with args;
+let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
 stdenv.mkDerivation rec {
   version = "2.4.0";
@@ -13,10 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "1m2g2bafjixbwl5b9lna5h7r56y1rcayfnbp8kyjfd1c1ymbxaxk";
   };
 
-  buildInputs = [startFPC gawk];
+  buildInputs = [ startFPC gawk ];
 
   preConfigure =
-    if system == "i686-linux" || system == "x86_64-linux" then ''
+    if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then ''
       sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
     '' else "";
 
@@ -38,5 +36,3 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
-
-else (import ./default.nix (args // {startFPC = (import ./binary.nix args);}))
diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix
index 754cf4ed5ec..7ddbfa848d1 100644
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@@ -150,19 +150,31 @@ stdenv.mkDerivation ({
         || (cross != null && cross.config == "i586-pc-gnu"
             && libcCross != null))
     then
-      # On GNU/Hurd glibc refers to Hurd & Mach headers so add the right `-I'
-      # flags to the default spec string.
+      # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
+      # in glibc, so add the right `-I' flags to the default spec string.
       let
         libc = if cross != null then libcCross else stdenv.glibc;
-        config_h = "gcc/config/i386/gnu.h";
+        gnu_h = "gcc/config/gnu.h";
+        i386_gnu_h = "gcc/config/i386/gnu.h";
+        extraCPPDeps =
+             libc.propagatedBuildInputs
+          ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
+          ++ stdenv.lib.optional (libpthread != null) libpthread;
         extraCPPSpec =
           concatStrings (intersperse " "
-                          (map (x: "-I${x}/include")
-                               libc.propagatedBuildInputs));
+                          (map (x: "-I${x}/include") extraCPPDeps));
+        extraLibSpec =
+          if libpthreadCross != null
+          then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
+          else "-L${libpthread}/lib";
       in
-        '' echo "augmenting \`CPP_SPEC' in \`${config_h}' with \`${extraCPPSpec}'..."
-           sed -i "${config_h}" \
+        '' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..."
+           sed -i "${i386_gnu_h}" \
                -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
+
+           echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
         ''
     else null;
 
@@ -205,8 +217,6 @@ stdenv.mkDerivation ({
     --disable-libstdcxx-pch
     --without-included-gettext
     --with-system-zlib
-    --enable-lto
-    --enable-plugin
     --enable-languages=${
       concatStrings (intersperse ","
         (  optional langC        "c"
@@ -320,7 +330,7 @@ stdenv.mkDerivation ({
     if cross != null && libcCross != null
     then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
          (optionalString (libpthreadCross != null)
-           " -L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}")
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
     else null;
 
   passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 9c88dc67cf8..2f02ee2e2e1 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,30 +1,50 @@
 a :  
 let 
   buildInputs = with a; [
-    mpfr m4 binutils emacs
+    mpfr m4 binutils emacs gmp
     libX11 xproto inputproto libXi 
     libXext xextproto libXt libXaw libXmu
+    zlib which texinfo texLive
   ]; 
 in
+
+assert a.stdenv ? gcc ;
+assert a.stdenv.gcc ? gcc ;
+assert a.stdenv.gcc ? libc ;
+assert a.stdenv.gcc.gcc != null ;
+assert a.stdenv.gcc.libc != null ;
+
 rec {
   src = a.fetchcvs {
     cvsRoot = ":pserver:anonymous@cvs.sv.gnu.org:/sources/gcl";
     module = "gcl";
-    tag = "Version_2_6_8pre";
-    date = "2009-11-05";
-    sha256 = "5aa6c1616f585466a6aae91e38472f20539be4ce978fd458592e425904bdd9bc";
+    # tag = "Version_2_6_8pre";
+    date = "2010-07-01";
+    sha256 = "a61d1bf669fd11d13050e8e1ab850a5eecb38126b47c744c3e21646773c4fb4d";
   };
 
   name = "gcl-2.6.8pre";
   inherit buildInputs;
-  configureFlags = [];
+  configureFlags = [
+    "--enable-ansi"
+  ];
+
+  # Upstream bug submitted - http://savannah.gnu.org/bugs/index.php?30371
+  # $TMPDIR must have no extension
+  setVars = a.noDepEntry ''
+    export TMPDIR="''${TMPDIR:-''${TMP:-''${TEMP}}}/tmp-for-gcl"
+    mkdir -p "$TMPDIR"
+  '';
 
   preBuild = a.fullDepEntry (''
-    echo '(defun init_gcl_cmpmap (&rest args))' >> cmpnew/cmpmap.lsp
-  '') ["minInit" "doUnpack"];
+    sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure
+    sed -re "s@if test -d /proc/self @if false @" -i configure
+    sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.gcc.gcc}/include -I${a.stdenv.gcc.libc}/include ^g' -i makefile
+  '') ["minInit" "doUnpack" "addInputs"];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["preBuild" "doConfigure" "doMakeInstall"];
+  phaseNames = ["setVars" "doUnpack" "preBuild" 
+    "doConfigure" "doMakeInstall"];
       
   meta = {
     description = "GNU Common Lisp compiler working via GCC";
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
new file mode 100644
index 00000000000..c6e05e8a785
--- /dev/null
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -0,0 +1,84 @@
+{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+
+stdenv.mkDerivation rec {
+  version = "6.12.3";
+  
+  name = "ghc-${version}";
+  
+  # TODO: Does this have to be here, or can it go to meta?
+  homepage = "http://haskell.org/ghc";
+
+  src = fetchurl {
+    url = "http://darcs.haskell.org/download/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "0s2y1sv2nq1cgliv735q2w3gg4ykv1c0g1adbv8wgwhia10vxgbc";
+  };
+
+  buildInputs = [ghc perl gmp ncurses];
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+  '';
+
+  configureFlags=[
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    inherit homepage;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+    ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+  # TODO: requires a comment as to what it does and why it is needed.
+  passthru = {
+    corePackages = [
+       [ "Cabal" "1.8.0.2" ]
+       [ "array" "0.3.0.0" ]
+       [ "base" "3.0.3.2" ]
+       [ "base" "4.2.0.0" ]
+       [ "bin-package-db" "0.0.0.0" ]
+       [ "bytestring" "0.9.1.5" ]
+       [ "containers" "0.3.0.0" ]
+       [ "directory" "1.0.1.0" ]
+       [ "dph-base" "0.4.0" ]
+       [ "dph-par" "0.4.0" ]
+       [ "dph-prim-interface" "0.4.0" ]
+       [ "dph-prim-par" "0.4.0" ]
+       [ "dph-prim-seq" "0.4.0" ]
+       [ "dph-seq" "0.4.0" ]
+       [ "extensible-exceptions" "0.1.1.1" ]
+       [ "ffi" "1.0" ]
+       [ "filepath" "1.1.0.3" ]
+       [ "ghc" "6.12.1" ]
+       [ "ghc-binary" "0.5.0.2" ]
+       [ "ghc-prim" "0.2.0.0" ]
+       [ "haskell98" "1.0.1.1" ]
+       [ "hpc" "0.5.0.4" ]
+       [ "integer-gmp" "0.2.0.0" ]
+       [ "old-locale" "1.0.0.2" ]
+       [ "old-time" "1.0.0.3" ]
+       [ "pretty" "1.0.1.1" ]
+       [ "process" "1.0.1.2" ]
+       [ "random" "1.0.0.2" ]
+       [ "rts" "1.0" ]
+       [ "syb" "0.1.0.2" ]
+       [ "template-haskell" "2.4.0.0" ]
+       [ "time" "1.1.4" ]
+       [ "unix" "2.4.0.0" ]
+       [ "utf8-string" "0.3.4" ]
+    ];
+  };
+}
diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix
index 4f3bbc6294b..db712b18d3f 100644
--- a/pkgs/development/compilers/hugs/default.nix
+++ b/pkgs/development/compilers/hugs/default.nix
@@ -1,24 +1,26 @@
-args: with args;
+{ composableDerivation, fetchurl }:
+
 let edf = composableDerivation.edf;
     wwf = composableDerivation.wwf; in
+    
 composableDerivation.composableDerivation {} {
-
-  name="hugs98";
+  name = "hugs98";
 
   src = fetchurl {
-      url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz;
-      sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6";
+    url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz;
+    sha256 = "3cf4d27673564cffe691bd14032369f646233f14daf2bc37c6c6df9f062b46b6";
   };
 
-      #encode all character I/O using the byte encoding
-      #determined by the locale in effect at that time. To
-      #require that the UTF-8 encoding is always used, give
-      #the --enable-char-encoding=utf8 option.
-      #[default=autodetect]
+  #encode all character I/O using the byte encoding
+  #determined by the locale in effect at that time. To
+  #require that the UTF-8 encoding is always used, give
+  #the --enable-char-encoding=utf8 option.
+  #[default=autodetect]
   postUnpack = ''
     find -type f | xargs sed -i 's@/bin/cp@cp@';
   '';
-  configurePhase="./configure --prefix=\$out --enable-char-encoding=utf8 $configureFlags";
+  
+  configurePhase = "./configure --prefix=\$out --enable-char-encoding=utf8 $configureFlags";
 
   flags =
        edf { name = "pathCanonicalization"; feat="path-canonicalization"; }
@@ -39,16 +41,13 @@ composableDerivation.composableDerivation {} {
 
   cfg = {
     largeBannerSupport = true; # seems to be default
-
-
-      char = { cfgOption = "--enable-char-encoding"; blocks = "utf8"; };
-      utf8 = { cfgOption = "--enable-char-encoding=utf8"; blocks="char"; };
-
-    };
+    char = { cfgOption = "--enable-char-encoding"; blocks = "utf8"; };
+    utf8 = { cfgOption = "--enable-char-encoding=utf8"; blocks="char"; };
+  };
 
   meta = {
     license = "as-is"; # gentoo is calling it this way..
-    description = "The HUGS98 Haskell <interpreter";
+    description = "The HUGS 98 Haskell interpreter";
     homepage = http://www.haskell.org/hugs;
   };
 }
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index fbbaf72fe7d..1fcdb3e4c0b 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl}:
 
 stdenv.mkDerivation {
-  name = "mono-2.4.2.1";
+  name = "mono-2.6.4";
   src = fetchurl {
-    url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.1.tar.bz2;
-    sha256 = "0cbg29fz5xnyjmznwzsmaxrr0cxqisyxk7jx7m56p3zzr379f0f5";
+    url = http://ftp.novell.com/pub/mono/sources/mono/mono-2.6.4.tar.bz2;
+    sha256 = "08krrl9zdigzxxa10c9scy518301l20xmw6dc2w8s0rvrhxryny0";
   };
 
   buildInputs = [bison pkgconfig glib gettext perl];
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index ee8474947f8..060d59476cf 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -1,16 +1,17 @@
-args: with args;
+{ composableDerivation, lib, fetchurl, mysql, apacheHttpd, zlib, sqlite
+, pcre, apr, gtk, boehmgc, pkgconfig, makeWrapper, sourceFromHead }:
 
 let
 
-  inherit (args.composableDerivation) composableDerivation edf wwf;
+  inherit (composableDerivation) edf wwf;
 
-  libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk];
+  libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk ];
 
   includes = lib.concatMapStrings (x: ''"${x}/include",'' ) libs + ''"{gkt}/include/gtk-2.0",'';
   
 in
 
-composableDerivation {} ( fixed : {
+composableDerivation.composableDerivation {} ( fixed : {
 
   name = "neko-cvs";
 
@@ -19,11 +20,6 @@ composableDerivation {} ( fixed : {
                (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_16-06-48.tar.gz"; sha256 = "e952582a26099b7a5568d0798839a6d349331510ffe6d7936b4537d60b6ccf26"; });
   # END
 
-  # # REGION AUTO UPDATE:           { name="neko_git"; type="git"; url=""; }
-  # src = sourceFromHead "neko_git-3abfb2f6d68cc301f9795e10c75734e293b4cfa9.tar.gz"
-  #              (throw "source not not published yet: neko_git");
-  # # END
-
   # optionally remove apache mysql like gentoo does?
   # they just remove libs/{apache,mod_neko}
   buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs;
@@ -47,8 +43,8 @@ composableDerivation {} ( fixed : {
     description = "Neko is an high-level dynamicly typed programming language";
     homepage = http://nekovm.org;
     license = ["GPLv2" ];  # -> docs/license.txt
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ lib.maintainers.marcweber ];
+    platforms = lib.platforms.linux;
   };
 
   # if stripping was done neko and nekoc would be the same. ?!
diff --git a/pkgs/development/compilers/ocaml/3.08.0.nix b/pkgs/development/compilers/ocaml/3.08.0.nix
index b2e7e131a81..4f7e9469bbf 100644
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/3.08.0.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, x11 }:
 
 stdenv.mkDerivation {
   name = "ocaml-3.08.0";
diff --git a/pkgs/development/compilers/ocaml/3.09.1.nix b/pkgs/development/compilers/ocaml/3.09.1.nix
deleted file mode 100644
index 6e9922ccc36..00000000000
--- a/pkgs/development/compilers/ocaml/3.09.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  name = "ocaml-3.09.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://caml.inria.fr/pub/distrib/ocaml-3.09/ocaml-3.09.1.tar.gz;
-    md5 = "c73f4b093e27ba5bf13d62923f89befc";
-  };
-  configureScript = ./configure-3.09.1;
-  dontAddPrefix = "True";
-  configureFlags = ["-no-tk" "-x11lib" x11];
-  buildFlags = ["world" "bootstrap" "opt"];
-  checkTarget = ["opt.opt"];
-  buildInputs = [x11  ncurses];
-}
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index 8a8ddd7ee97..a77e5fdd0ac 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, x11, ncurses }:
 
 stdenv.mkDerivation (rec {
   
diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix
index c825830e43d..e22db680577 100644
--- a/pkgs/development/compilers/ocaml/3.11.1.nix
+++ b/pkgs/development/compilers/ocaml/3.11.1.nix
@@ -1,11 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, ncurses, x11 }:
 
 let
-   useX11 = (stdenv.system != "armv5tel-linux");
-   useNativeCompilers = (stdenv.system != "armv5tel-linux");
+   useX11 = stdenv.system != "armv5tel-linux";
+   useNativeCompilers = stdenv.system != "armv5tel-linux";
    inherit (stdenv.lib) optionals optionalString;
 in
-stdenv.mkDerivation (rec {
+
+stdenv.mkDerivation rec {
   
   name = "ocaml-3.11.1";
   
@@ -49,4 +50,4 @@ stdenv.mkDerivation (rec {
        '';
   };
 
-})
+}
diff --git a/pkgs/development/compilers/path64/default.nix b/pkgs/development/compilers/path64/default.nix
new file mode 100644
index 00000000000..f99806c7d20
--- /dev/null
+++ b/pkgs/development/compilers/path64/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchgit, perl, flex, bison, gmp, mpfr, cmake}:
+
+assert stdenv.system == "x86_64-linux";
+
+stdenv.mkDerivation {
+  name = "path64-2010-07-02";
+
+  src = fetchgit {
+    url = git://github.com/path64/compiler.git;
+    rev = "e17f7f952831bbf1d996";
+    sha256 = "fa1320959e1131557d5f82e98f4621a222ec45e1d6e0e7f271d2c13de4fd0dd1";
+  };
+
+  patchPhase = ''
+    sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c
+    sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.glibc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in
+  '';
+
+  cmakeFlags = ''
+    -DPATH64_ENABLE_HUGEPAGES=ON 
+    -DPATH64_ENABLE_MATHLIBS=ON -DPATH64_ENABLE_OPENMP=ON 
+    -DPATH64_ENABLE_PSCRUNTIME=OFF
+    -DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664 
+    -DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF
+    -DPSC_CRT_PATH=${stdenv.glibc}/lib
+  '';
+
+  makeFlags = "-j4";
+
+  installPhase = ''
+    exit 1; 
+  '';
+
+  buildInputs = [ perl flex bison gmp mpfr cmake ];
+}
diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/default.nix
index 8f094f9965a..f1f34f87d69 100644
--- a/pkgs/development/compilers/qi/9.1.nix
+++ b/pkgs/development/compilers/qi/default.nix
@@ -1,4 +1,4 @@
-args : with args;
+{ stdenv, fetchurl, builderDefs, unzip, clisp }:
 	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 		fetchurl {
diff --git a/pkgs/development/compilers/roadsend/default.nix b/pkgs/development/compilers/roadsend/default.nix
index e23179c1288..f17cbbbda9a 100644
--- a/pkgs/development/compilers/roadsend/default.nix
+++ b/pkgs/development/compilers/roadsend/default.nix
@@ -1,8 +1,12 @@
-args: with args;
+{ composableDerivation, fetchurl, bigloo, curl, fcgi ? null, libxml2 ? null, mysql ? null }:
+
 let edf = composableDerivation.edf; in
+
 composableDerivation.composableDerivation {} {
   name = "roadsend-2.9.3";
+  
   buildInputs = [bigloo curl];
+  
   flags = edf { name = "pcre"; }
        // edf { name = "fcgi"; enable = { inherit fcgi; }; }
        // edf { name = "xml"; enable = { buildInputs = [ libxml2 ]; }; }
@@ -10,24 +14,24 @@ composableDerivation.composableDerivation {} {
        // edf { name = "odbc"; };
        # // edf { name = "gtk"} }
        # // edf { name = "gtk2", enable = { buildInputs = [ mysql ]; } }
+
   cfg = {
     pcreSupport = true;
     fcgiSupport = true;
     xmlSupport = true;
     mysqlSupport = true;
   };
-  src = args.fetchurl {
+  
+  src = fetchurl {
     url = "http://code.roadsend.com/snaps/roadsend-php-20081210.tar.bz2";
     sha256 = "0yhpiik0dyayd964wvn2k0cq7b1gihx1k3qx343r2l7lla4mapsx";
   };
 
-#    http://code.roadsend.com/snaps/roadsend-php-testsuite-2.9.7.tar.bz2";
-#   sha256 = "0rf0g9r0prla7daq3aif24d7dx0j01i35hcm8h5bbg3gvpfim463";
-
   # tell pcc where to find the fastcgi library 
   postInstall = " sed -e \"s=(ldflags fastcgi.*=(ldflags -l fastcgi -L \$fcgi)=\" -i \$out/etc/pcc.conf ";
+  
   meta = {
-    description = "roadsend PHP -> C compiler";
+    description = "A PHP to C compiler";
     homepage = http://www.roadsend.com;
     # you can choose one of the following licenses: 
     # Runtime license is LPGL 2.1
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 16d9f06cd79..0ead1d5e985 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -19,6 +19,8 @@ rec {
       
   setVars = a.fullDepEntry (''
     export INSTALL_ROOT=$out
+    mkdir test-home
+    export HOME=$PWD/test-home
   '') ["minInit"];
 
   setVersion = a.fullDepEntry (''
diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix
index efb90273dc6..870cd06938e 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.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";
+   version="1.0.41";
+   name="sbcl-1.0.41";
+   hash="019h0lrbd4q1f0bfwg3974pq81qcriwk5kd3v7gp1dmi5rajgnrk";
+   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.41/sbcl-1.0.41-source.tar.bz2";
+   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.41/sbcl-1.0.41-source.tar.bz2";
   
   
 }
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 3f824786119..3e11c230311 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl }:
 
 # at runtime, need jre or jdk
 
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
new file mode 100644
index 00000000000..a71af87f666
--- /dev/null
+++ b/pkgs/development/compilers/vala/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, yacc, flex, pkgconfig, glib}:
+
+stdenv.mkDerivation rec {
+  name = "vala-0.9.2";
+  src = fetchurl {
+    url = "mirror://gnome/sources/vala/0.9/vala-0.9.2.tar.bz2";
+    sha256 = "079wsdzb7dlp5kfprvjlhdd0d34jshdn3c7qbngr4qq6g4jf5q92";
+  };
+  buildInputs = [ yacc flex glib pkgconfig ];
+  meta = {
+    description = "Compiler for the GObject type system";
+    homepage = "http://live.gnome.org/Vala";
+  };
+}
diff --git a/pkgs/development/compilers/vs90wrapper/default.nix b/pkgs/development/compilers/vs90wrapper/default.nix
new file mode 100644
index 00000000000..47d7c2654a1
--- /dev/null
+++ b/pkgs/development/compilers/vs90wrapper/default.nix
@@ -0,0 +1,9 @@
+{stdenv}:
+
+stdenv.mkDerivation {
+  name = "visual-studio-9.0";
+  buildCommand = ''
+    ensureDir $out/bin
+    ln -s "/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" $out/bin/vcbuild.exe
+  '';
+}
diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix
index 7b0c3674002..3b881558aed 100644
--- a/pkgs/development/interpreters/clisp/2.44.1.nix
+++ b/pkgs/development/interpreters/clisp/2.44.1.nix
@@ -1,31 +1,36 @@
-args: with args;
+{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
+, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
+, libffi, libffcall, coreutils }:
+        
 stdenv.mkDerivation rec {
   v = "2.44.1";
   name = "clisp-${v}";
-  src =
-	fetchurl {
-		url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
-		sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
-	};
+  
+  src = fetchurl {
+    url = "mirror://gnu/clisp/release/${v}/${name}.tar.gz";
+    sha256 = "0rkp6j6rih4s5d9acifh7pi4b9xfgcspif512l269dqy9qgyy4j1";
+  };
 
-  inherit libsigsegv gettext coreutils;
-  buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
-	libXt pcre zlib libXpm xproto libXext xextproto libffi
-	libffcall];
+  buildInputs =
+    [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre
+      zlib libXpm xproto libXext xextproto libffi libffcall ];
  
   # First, replace port 9090 (rather low, can be used)
   # with 64237 (much higher, IANA private area, not
   # anything rememberable).
   patchPhase = ''
-  sed -e 's@9090@64237@g' -i tests/socket.tst
-  sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
-  find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
+    sed -e 's@9090@64237@g' -i tests/socket.tst
+    sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
+    find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
   '';
 
-  configureFlags = "--with-readline builddir --with-dynamic-ffi
-  --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
-  --with-module=pcre --with-module=rawsock --with-module=readline
-  --with-module=syscalls --with-module=wildcard --with-module=zlib";
+  configureFlags =
+    ''
+      --with-readline builddir --with-dynamic-ffi
+      --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
+      --with-module=pcre --with-module=rawsock --with-module=readline
+      --with-module=syscalls --with-module=wildcard --with-module=zlib
+    '';
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -38,9 +43,9 @@ stdenv.mkDerivation rec {
   doCheck = 1;
 
   meta = {
-	  description = "ANSI Common Lisp Implementation";
-	  homepage = http://clisp.cons.org;
-	  maintainers = [stdenv.lib.maintainers.raskin];
-	  platforms = stdenv.lib.platforms.linux;
+    description = "ANSI Common Lisp Implementation";
+    homepage = http://clisp.cons.org;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index a6e462753da..92098dc369a 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -1,31 +1,40 @@
-args: with args;
+{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
+, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
+, libffi, libffcall, coreutils }:
+
 stdenv.mkDerivation rec {
   v = "2.48";
   name = "clisp-${v}";
-  src =
-	fetchurl {
-		url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2";
-		sha256 = "1hix1j7zhbn37ld46d6pi6agwxski893l1zwriwkd8jr11b3zf05";
-	};
+  
+  src = fetchurl {
+    url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2";
+    sha256 = "1hix1j7zhbn37ld46d6pi6agwxski893l1zwriwkd8jr11b3zf05";
+  };
 
   inherit libsigsegv gettext coreutils;
-  buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
-	libXt pcre zlib libXpm xproto libXext xextproto libffi
-	libffcall];
+  
+  buildInputs =
+    [ libsigsegv gettext ncurses readline libX11 libXau
+      libXt pcre zlib libXpm xproto libXext xextproto libffi
+      libffcall
+    ];
  
   # First, replace port 9090 (rather low, can be used)
   # with 64237 (much higher, IANA private area, not
   # anything rememberable).
   patchPhase = ''
-  sed -e 's@9090@64237@g' -i tests/socket.tst
-  sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
-  find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
+    sed -e 's@9090@64237@g' -i tests/socket.tst
+    sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in
+    find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
   '';
 
-  configureFlags = "--with-readline builddir --with-dynamic-ffi
-  --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
-  --with-module=pcre --with-module=rawsock --with-module=readline
-  --with-module=syscalls --with-module=wildcard --with-module=zlib";
+  configureFlags =
+    ''
+      --with-readline builddir --with-dynamic-ffi
+      --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
+      --with-module=pcre --with-module=rawsock --with-module=readline
+      --with-module=syscalls --with-module=wildcard --with-module=zlib
+    '';
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -38,10 +47,10 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = {
-	  description = "ANSI Common Lisp Implementation";
-	  homepage = http://clisp.cons.org;
-	  maintainers = [stdenv.lib.maintainers.raskin];
-	  platforms = stdenv.lib.platforms.linux;
+    description = "ANSI Common Lisp Implementation";
+    homepage = http://clisp.cons.org;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 
diff --git a/pkgs/development/interpreters/erlang/R13B.nix b/pkgs/development/interpreters/erlang/R13B.nix
new file mode 100644
index 00000000000..05c8e1331ab
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R13B.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
+
+let version = "R13B"; in
+
+stdenv.mkDerivation {
+  name = "erlang-" + version;
+  
+  src = fetchurl {
+    url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz";
+    sha256 = "112889v9axhrk9x9swcgql5kpj19p14504m06h4n7b99irzxf4rg";
+  };
+  
+  buildInputs = [ perl gnum4 ncurses openssl ];
+  
+  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
+  
+  preConfigure = ''
+    export HOME=$PWD/../
+    sed -e s@/bin/pwd@pwd@g -i otp_build
+  '';
+  
+  configureFlags = "--with-ssl=${openssl}";
+}
diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix
index 37b78942dad..ec7438c2341 100644
--- a/pkgs/development/interpreters/erlang/default.nix
+++ b/pkgs/development/interpreters/erlang/default.nix
@@ -1,18 +1,23 @@
-args: with args;
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl }:
 
-let version = "R13B"; in
+let version = "R14A"; in
 
 stdenv.mkDerivation {
   name = "erlang-" + version;
+  
   src = fetchurl {
     url = "http://www.erlang.org/download/otp_src_" + version + ".tar.gz";
-    sha256 = "112889v9axhrk9x9swcgql5kpj19p14504m06h4n7b99irzxf4rg";
+    sha256 = "170n5p6al1bxwngdmafm1c6892xjxppb96gzgki9gfb0mla6li73";
   };
-  buildInputs = [perl gnum4 ncurses openssl];
+  
+  buildInputs = [ perl gnum4 ncurses openssl ];
+  
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
+  
   preConfigure = ''
     export HOME=$PWD/../
     sed -e s@/bin/pwd@pwd@g -i otp_build
   '';
+  
   configureFlags = "--with-ssl=${openssl}";
 }
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index b7dc135215c..cc994aeea34 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, unzip }:
 
 # at runtime, need jdk
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   phases = "unpackPhase installPhase";
 
-  buildInputs = [unzip];
+  buildInputs = [ unzip ];
 
   meta = {
     description = "An agile dynamic language for the Java Platform";
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 3c0db6c6dcc..d26ab694934 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "jruby-1.1.6";
 
@@ -7,12 +8,11 @@ stdenv.mkDerivation {
     sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a";
   };
 
-  buildInputs = [];
   installPhase = '' ensureDir $out; cp -r * $out '';
 
   meta = { 
-      description = "ruby interpreter written in Java";
-      homepage = http://jruby.codehaus.org/;
-      license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those
+    description = "Ruby interpreter written in Java";
+    homepage = http://jruby.codehaus.org/;
+    license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those
   };
 }
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 2b0d79f8019..5a35df4c513 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation {
     url = http://www.lua.org/ftp/lua-5.1.4.tar.gz;
     sha256 = "0fmgk100ficm1jbm4ga9xy484v4cm89wsdfckdybb9gjx8jy4f5h";
   };
+  makeFlags = [ "CFLAGS=-fPIC" ];
   buildFlags = "linux"; # TODO: support for non-linux systems
   installFlags = "install INSTALL_TOP=\${out}";
   buildInputs = [ ncurses readline ];
diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix
index 6fdeac2d24c..74aba643ee7 100644
--- a/pkgs/development/interpreters/php-xdebug/default.nix
+++ b/pkgs/development/interpreters/php-xdebug/default.nix
@@ -1,13 +1,14 @@
-args: with args;
+{ stdenv, fetchurl, php, autoconf, automake }:
+
 stdenv.mkDerivation {
-  name = "php-xdebug";
+  name = "php-xdebug-2.0.5";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = "http://xdebug.org/files/xdebug-2.0.5.tgz";
     sha256 = "1cmq7c36gj8n41mfq1wba5rij8j77yqhydpcsbcysk1zchg68f26";
   };
 
-  buildInputs = [php autoconf automake];
+  buildInputs = [ php autoconf automake ];
 
   configurePhase = ''
     phpize
@@ -25,10 +26,10 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "php debugger and profiler extension";
+    description = "PHP debugger and profiler extension";
     homepage = http://xdebug.org/;
     license = "xdebug"; # based on PHP-3
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/php/builder.sh b/pkgs/development/interpreters/php/builder.sh
deleted file mode 100644
index a5aadf2857f..00000000000
--- a/pkgs/development/interpreters/php/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-source $stdenv/setup
-
-alias lex=flex
-
-configureFlags="$configureFlags \
-  --with-libxml-dir=$libxml2 \
-  --with-apxs2=$apacheHttpd/bin/apxs \
-  --without-libexpat-dir"
-
-if test -n "$unixODBC"; then
-    configureFlags="$configureFlags --with-unixODBC=$unixODBC"
-fi
-
-if test -n "$postgresql"; then
-    configureFlags="$configureFlags --with-pgsql=$postgresql"
-fi
-
-if test -n "$mysql"; then
-    configureFlags="$configureFlags --with-mysql=$mysql"
-fi
-  
-makeFlags="APXS_LIBEXECDIR=$out/modules $makeFlags"
-        
-genericBuild
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index dc704b768c9..422d6ceba87 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,23 +1,168 @@
-{stdenv, fetchurl, flex, bison, libxml2, apacheHttpd, unixODBC ? null, postgresql ? null, mysql ? null}:
+args: with args;
 
-assert libxml2 != null;
+let
 
-stdenv.mkDerivation {
-  name = "php-5.2.4";
-  src = fetchurl {
-    url = http://nl3.php.net/distributions/php-5.2.4.tar.bz2;
-    sha256 = "1h513j7crz08n7rlh8v7cvxfzisj87mvvyfrkiaa76v1wicm4bsh";
+  inherit (args.composableDerivation) composableDerivation edf wwf;
+
+in
+
+composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
+
+  version = "5.2.13";
+
+  name = "php_configurable-${version}";
+
+  buildInputs = ["flex" "bison" "pkgconfig"];
+
+  flags = {
+
+# much left to do here...
+
+    # SAPI modules:
+    
+      apxs2 = {
+        configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
+        buildInputs = [apacheHttpd];
+      };
+
+      # Extensions
+
+      curl = {
+        configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"];
+        buildInputs = [curl openssl];
+      };
+      
+      zlib = {
+        configureFlags = ["--with-zlib=${args.zlib}"];
+        buildInputs = [zlib];
+      };
+
+      libxml2 = {
+        configureFlags = [
+          "--with-libxml-dir=${libxml2}"
+          "--with-iconv-dir=${libiconv}"
+          ];
+        buildInputs = [ libxml2 ];
+      };
+    
+      sqlite = {
+        configureFlags = ["--with-pdo-sqlite=${sqlite}"];
+        buildInputs = [ sqlite ];
+      };
+    
+      postgresql = {
+        configureFlags = ["--with-pgsql=${postgresql}"];
+        buildInputs = [ postgresql ];
+      };
+    
+      mysql = {
+        configureFlags = ["--with-mysql=${mysql}"];
+        buildInputs = [ mysql ];
+      };
+
+      mysqli = {
+        configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
+        buildInputs = [ mysql];
+      };
+
+      mysqli_embedded = {
+        configureFlags = ["--enable-embedded-mysqli"];
+        depends = "mysqli";
+        assertion = fixed.mysqliSupport;
+      };
+
+      pdo_mysql = {
+        configureFlags = ["--with-pdo-mysql=${mysql}"];
+        buildInputs = [ mysql ];
+      };
+    
+      bcmath = {
+        configureFlags = ["--enable-bcmath"];
+      };
+
+      gd = {
+        configureFlags = ["--with-gd=${args.gd}"];
+        buildInputs = [gd libpng libjpeg ];
+      };
+
+      soap = {
+        configureFlags = ["--enable-soap"];
+      };
+
+      sockets = {
+        configureFlags = ["--enable-sockets"];
+      };
+
+      openssl = {
+        configureFlags = ["--with-openssl=${args.openssl}"];
+        buildInputs = ["openssl"];
+      };
+
+      mbstring = {
+        configureFlags = ["--enable-mbstring"];
+      };
+
+      /*
+         php is build within this derivation in order to add the xdebug lines to the php.ini.
+         So both Apache and command line php both use xdebug without having to configure anything.
+         Xdebug could be put in its own derivation.
+      * /
+        meta = {
+                description = "debugging support for PHP";
+                homepage = http://xdebug.org;
+                license = "based on the PHP license - as is";
+                };
+      */
+    };
+
+  cfg = {
+    mysqlSupport = getConfig ["php" "mysql"] true;
+    mysqliSupport = getConfig ["php" "mysqli"] true;
+    pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true;
+    libxml2Support = getConfig ["php" "libxml2"] true;
+    apxs2Support = getConfig ["php" "apxs2"] true;
+    bcmathSupport = getConfig ["php" "bcmath"] true;
+    socketsSupport = getConfig ["php" "sockets"] true;
+    curlSupport = getConfig ["php" "curl"] true;
+    gettextSupport = getConfig ["php" "gettext"] true;
+    postgresqlSupport = getConfig ["php" "postgresql"] true;
+    sqliteSupport = getConfig ["php" "sqlite"] true;
+    soapSupport = getConfig ["php" "soap"] true;
+    zlibSupport = getConfig ["php" "zlib"] true;
+    opensslSupport = getConfig ["php" "openssl"] true;
+    mbstringSupport = getConfig ["php" "mbstring"] true;
+    gdSupport = getConfig ["php" "gd"] true;
   };
-  
-  inherit flex bison libxml2 apacheHttpd;
 
-  builder = ./builder.sh;
+  # only -O1
+  configurePhase = ''
+    iniFile=$out/etc/php-recommended.ini
+    [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
+    ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out  $configureFlags
+    echo configurePhase end
+    sed -e 's/-O2/-O1/g' -i Makefile # http://bugs.php.net/bug.php?id=47730&edit=3
+  '';
+
+  installPhase = ''
+    unset installPhase; installPhase;
+    cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0
+        then "recommended" /* < PHP 5.3 */
+        else "production" /* >= PHP 5.3 */
+    } $iniFile
+  '';
 
-  buildInputs = [flex bison libxml2 apacheHttpd];
+  src = args.fetchurl {
+    url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
+    sha256 = "1nzaqwsxah7hc59931dk81n2fxyqaaa3yqyisj6akf9vbr9s4l1b";
+    name = "php-${version}.tar.bz2";
+  };
 
-  inherit unixODBC postgresql mysql;
-  
-  odbcSupport = unixODBC != null;
+  meta = {
+    description = "The PHP language runtime engine";
+    homepage = http://www.php.net/;
+    license = "PHP-3";
+  };
 
   patches = [./fix.patch];
-}
+
+})
diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php_configurable/default.nix
deleted file mode 100644
index af639a59e8c..00000000000
--- a/pkgs/development/interpreters/php_configurable/default.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-args: with args;
-
-let
-
-  inherit (args.composableDerivation) composableDerivation edf wwf;
-
-in
-
-composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
-
-  # choose a different version this way:
-  # php.merge { version = "5.3.2"; }
-  version = "5.2.11";
-
-  name = "php_configurable-${version}";
-
-  buildInputs = ["flex" "bison" "pkgconfig"];
-
-  flags = {
-
-# much left to do here...
-
-    # SAPI modules:
-    
-      apxs2 = {
-        configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
-        buildInputs = [apacheHttpd];
-      };
-
-      # Extensions
-
-      curl = {
-        configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"];
-        buildInputs = [curl openssl];
-      };
-      
-      zlib = {
-        configureFlags = ["--with-zlib=${args.zlib}"];
-        buildInputs = [zlib];
-      };
-
-      libxml2 = {
-        configureFlags = [
-          "--with-libxml-dir=${libxml2}"
-          "--with-iconv-dir=${libiconv}"
-          ];
-        buildInputs = [ libxml2 ];
-      };
-    
-      sqlite = {
-        configureFlags = ["--with-pdo-sqlite=${sqlite}"];
-        buildInputs = [ sqlite ];
-      };
-    
-      postgresql = {
-        configureFlags = ["--with-pgsql=${postgresql}"];
-        buildInputs = [ postgresql ];
-      };
-    
-      mysql = {
-        configureFlags = ["--with-mysql=${mysql}"];
-        buildInputs = [ mysql ];
-      };
-
-      mysqli = {
-        configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
-        buildInputs = [ mysql];
-      };
-
-      mysqli_embedded = {
-        configureFlags = ["--enable-embedded-mysqli"];
-        depends = "mysqli";
-        assertion = fixed.mysqliSupport;
-      };
-
-      pdo_mysql = {
-        configureFlags = ["--with-pdo-mysql=${mysql}"];
-        buildInputs = [ mysql ];
-      };
-    
-      bcmath = {
-        configureFlags = ["--enable-bcmath"];
-      };
-
-      gd = {
-        configureFlags = ["--with-gd=${args.gd}"];
-        buildInputs = [gd libpng libjpeg ];
-      };
-
-      soap = {
-        configureFlags = ["--enable-soap"];
-      };
-
-      sockets = {
-        configureFlags = ["--enable-sockets"];
-      };
-
-      openssl = {
-        configureFlags = ["--with-openssl=${args.openssl}"];
-        buildInputs = ["openssl"];
-      };
-
-      mbstring = {
-        configureFlags = ["--enable-mbstring"];
-      };
-
-      /*
-         php is build within this derivation in order to add the xdebug lines to the php.ini.
-         So both Apache and command line php both use xdebug without having to configure anything.
-         Xdebug could be put in its own derivation.
-      * /
-        meta = {
-                description = "debugging support for PHP";
-                homepage = http://xdebug.org;
-                license = "based on the PHP license - as is";
-                };
-      */
-    };
-
-  cfg = {
-    mysqlSupport = getConfig ["php" "mysql"] true;
-    mysqliSupport = getConfig ["php" "mysqli"] true;
-    pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true;
-    libxml2Support = getConfig ["php" "libxml2"] true;
-    apxs2Support = getConfig ["php" "apxs2"] true;
-    bcmathSupport = getConfig ["php" "bcmath"] true;
-    socketsSupport = getConfig ["php" "sockets"] true;
-    curlSupport = getConfig ["php" "curl"] true;
-    gettextSupport = getConfig ["php" "gettext"] true;
-    postgresqlSupport = getConfig ["php" "postgresql"] true;
-    sqliteSupport = getConfig ["php" "sqlite"] true;
-    soapSupport = getConfig ["php" "soap"] true;
-    zlibSupport = getConfig ["php" "zlib"] true;
-    opensslSupport = getConfig ["php" "openssl"] true;
-    mbstringSupport = getConfig ["php" "mbstring"] true;
-    gdSupport = getConfig ["php" "gd"] true;
-  };
-
-  # only -O1
-  configurePhase = ''
-    iniFile=$out/etc/php-recommended.ini
-    [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
-    ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out  $configureFlags
-    echo configurePhase end
-    sed -e 's/-O2/-O1/g' -i Makefile # http://bugs.php.net/bug.php?id=47730&edit=3
-  '';
-
-  installPhase = ''
-    unset installPhase; installPhase;
-    cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0
-        then "recommended" /* < PHP 5.3 */
-        else "production" /* >= PHP 5.3 */
-    } $iniFile
-  '';
-
-  src = args.fetchurl {
-    url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    md5 = if version == "5.3.2" then "46f500816125202c48a458d0133254a4"
-          else if version == "5.2.11" then "286bf34630f5643c25ebcedfec5e0a09"
-          else throw "set md5 sum of php source file" ;
-    name = "php-${version}.tar.bz2";
-  };
-
-  meta = {
-    description = "The PHP language runtime engine";
-    homepage = http://www.php.net/;
-    license = "PHP-3";
-  };
-
-  patches = [./fix.patch];
-
-})
diff --git a/pkgs/development/interpreters/php_configurable/fix.patch b/pkgs/development/interpreters/php_configurable/fix.patch
deleted file mode 100644
index 1cec8fea0fe..00000000000
--- a/pkgs/development/interpreters/php_configurable/fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- php-5.0.4/configure	2005-04-03 11:42:50.000000000 +0200
-+++ php-5.0.4-1/configure	2005-07-10 11:06:22.292271176 +0200
-@@ -3381,7 +3381,7 @@
- 
-   case $host_alias in
-   *aix*)
--    APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
-+    APXS_LIBEXECDIR="$prefix/modules"
-     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-     PHP_AIX_LDFLAGS="-Wl,-brtl"
-     build_type=shared
-@@ -3576,7 +3576,7 @@
-   if test "$?" != "0"; then
-     APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-   else 
--    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+    APXS_LIBEXECDIR="$prefix/modules"
-     if test -z `$APXS -q SYSCONFDIR`; then
-       APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-@@ -4680,7 +4680,7 @@
-     { echo "configure: error: Please note that Apache version >= 2.0.40 is required." 1>&2; exit 1; }
-   fi
- 
--  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+  APXS_LIBEXECDIR="$prefix/modules"
-   if test -z `$APXS -q SYSCONFDIR`; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-@@ -5510,7 +5510,7 @@
-     { echo "configure: error: Please note that Apache version >= 2.0.44 is required." 1>&2; exit 1; }
-   fi
- 
--  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+  APXS_LIBEXECDIR="$prefix/modules"
-   if test -z `$APXS -q SYSCONFDIR`; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-@@ -6327,7 +6327,7 @@
- 
-   case $host_alias in
-   *aix*)
--    APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR`
-+    APXS_LIBEXECDIR="$prefix/modules"
-     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
-     PHP_AIX_LDFLAGS="-Wl,-brtl"
-     build_type=shared
-@@ -6522,7 +6522,7 @@
-   if test "$?" != "0"; then
-     APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
-   else 
--    APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+    APXS_LIBEXECDIR="$prefix/modules"
-     if test -z `$APXS -q SYSCONFDIR`; then
-       APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix
index 415ed78f117..5ba57dbc1ea 100644
--- a/pkgs/development/interpreters/pyrex/0.9.5.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.5.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, builderDefs, python }:
 
 let
 
diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
index 471532be2fe..cd233415615 100644
--- a/pkgs/development/interpreters/pyrex/0.9.6.nix
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, builderDefs, python }:
 
 let
 
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 93845ae17c4..43d0915c1f0 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -5,13 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.7-p72";
+  version = "1.8.7-p299";
   
   name = "ruby-${version}";
   
   src = fetchurl {
     url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz";
-    sha256 = "e15ca005076f5d6f91fc856fdfbd071698a4cadac3c6e25855899dba1f6fc5ef";
+    sha256 = "0ys2lpri2w3174axhi96vq17lrvk2ngj7f2m42a9008a7n79rj9j";
   };
 
   buildInputs = [ncurses readline]
diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix
index 97b9115b756..b63b38ebf29 100644
--- a/pkgs/development/interpreters/spidermonkey/default.nix
+++ b/pkgs/development/interpreters/spidermonkey/default.nix
@@ -1,10 +1,11 @@
-args: with args;
+{ stdenv, fetchurl, readline }:
 
 stdenv.mkDerivation rec {
   name = "spidermonkey-1.7";
+  
   src = fetchurl {
     url = ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz;
-	sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4";
+    sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4";
   };
 
   buildInputs = [ readline ];
@@ -13,8 +14,12 @@ stdenv.mkDerivation rec {
 
   makefileExtra = ./Makefile.extra;
   makefile = "Makefile.ref";
-  patchPhase = "cat ${makefileExtra} >> ${makefile};
-  sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}";
+  
+  patchPhase =
+    ''
+      cat ${makefileExtra} >> ${makefile}
+      sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}
+    '';
 
-  makeFlags="-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
+  makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
 }
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index 35154e9f945..89cf52f7e5e 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_image";
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index bd7b66f21a1..1821d746ac4 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, SDL, libogg, libvorbis }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_mixer";
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index 6c8c79d701c..cbca42ef5df 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, SDL }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_net";
diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix
new file mode 100644
index 00000000000..624faacde4f
--- /dev/null
+++ b/pkgs/development/libraries/SDL_sound/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, SDL, libvorbis, flac, libmikmod}:
+
+stdenv.mkDerivation rec {
+  name = "SDL_sound-1.0.3";
+
+  src = fetchurl {
+    url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz";
+    sha256 = "1pz6g56gcy7pmmz3hhych3iq9jvinml2yjz15fjqjlj8pc5zv69r";
+  };
+
+  buildInputs = [ SDL libvorbis flac libmikmod ];
+
+  postInstall = "ln -s $out/include/SDL/SDL_sound.h $out/include/";
+
+  meta = {
+    description = "SDL sound library";
+  };
+}
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index 29c1df93a50..591a4bfbd6d 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, SDL, freetype }:
 
 stdenv.mkDerivation {
   name = "SDL_ttf-2.0.9";
diff --git a/pkgs/development/libraries/atk/1.30.x.nix b/pkgs/development/libraries/atk/1.30.x.nix
new file mode 100644
index 00000000000..4f370fd7a2b
--- /dev/null
+++ b/pkgs/development/libraries/atk/1.30.x.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, perl, glib }:
+
+stdenv.mkDerivation rec {
+  name = "atk-1.30.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/atk/1.30/${name}.tar.bz2";
+    sha256 = "92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c";
+  };
+
+  buildInputs = [ pkgconfig perl ];
+  propagatedBuildInputs = [ glib ];
+
+  meta = {
+    description = "ATK, the accessibility toolkit";
+
+    longDescription = ''
+      ATK is the Accessibility Toolkit.  It provides a set of generic
+      interfaces allowing accessibility technologies such as screen
+      readers to interact with a graphical user interface.  Using the
+      ATK interfaces, accessibility tools have full access to view and
+      control running applications.
+    '';
+
+    homepage = http://library.gnome.org/devel/atk/;
+
+    license = "LGPLv2+";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
index b54680b3d3f..1bccf32b0f0 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/pkgs/development/libraries/audio/vamp/default.nix
@@ -1,6 +1,8 @@
 # set VAMP_PATH ?
 # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
-args: with args;
+
+{ stdenv, fetchurl, pkgconfig, libsndfile }:
+
 rec {
 
   vampSDK = stdenv.mkDerivation {
@@ -17,8 +19,8 @@ rec {
       description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
       homepage = http://sourceforge.net/projects/vamp;
       license = "BSD";
-      maintainers = [args.lib.maintainers.marcweber];
-      platforms = args.lib.platforms.linux;
+      maintainers = [ stdenv.lib.maintainers.marcweber ];
+      platforms = stdenv.lib.platforms.linux;
     };
   };
 
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index f481c8d65e3..b4424b445c5 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,14 +1,14 @@
 { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
 , expat, gettext, intltool, glib, gtk, qt4 ? null, lib
-, qt4Support ? false, ...}:
+, qt4Support ? false }:
 
 assert qt4Support -> qt4 != null;
 
 stdenv.mkDerivation rec {
-  name = "avahi-0.6.25";
+  name = "avahi-0.6.27";
   src = fetchurl {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "0ndsrd357igp0m2cd8vwr16gmh6axlndf34hlg7qqnsiymsdj84j";
+    sha256 = "112yqh5k4ph5f1fsd98q1035477wmzq5nm2jrkivz5fnn3hgabf2";
   };
 
   patches = [ ./no-mkdir-localstatedir.patch ];
@@ -17,11 +17,13 @@ stdenv.mkDerivation rec {
       pkgconfig libdaemon dbus perl perlXMLParser glib expat
       gettext intltool
     ]
-    ++ lib.optional qt4Support qt4;
+    ++ (lib.optional qt4Support qt4);
 
   configureFlags =
-    [ "--disable-qt3" "--disable-gdbm" "--disable-gtk" "--disable-mono"
-      "--${if qt4Support then "enable" else "disable"}-qt4" "--disable-python"
+    [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
+      "--disable-gtk" "--disable-gtk3"
+      "--${if qt4Support then "enable" else "disable"}-qt4"
+      "--disable-python"
       "--with-distro=none" "--localstatedir=/var"
     ];
 
diff --git a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
index 29e5a05e09d..76377d10570 100644
--- a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
+++ b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch
@@ -1,14 +1,12 @@
 Don't "mkdir $(localstatedir)" since we can't do it (/var).
 
---- avahi-0.6.25/avahi-daemon/Makefile.in	2009-04-14 03:57:14.000000000 +0200
-+++ avahi-0.6.25/avahi-daemon/Makefile.in	2010-05-09 00:12:35.000000000 +0200
-@@ -1310,7 +1310,7 @@ xmllint:
+--- avahi-0.6.27/avahi-daemon/Makefile.in	2010-07-13 05:06:35.000000000 +0200
++++ avahi-0.6.27/avahi-daemon/Makefile.in	2010-07-13 18:03:45.000000000 +0200
+@@ -1554,7 +1554,6 @@ xmllint:
  	done
  
  install-data-local:
 -	test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"
-+
- # 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:
-
+ 
+ update-systemd:
+ 	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index d00e3f67f3c..2464a09f51a 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,17 +1,16 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "babl-0.0.22";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2;
     sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "image pixel format coneversion libraray";
-      homepage = http://gegl.org/babl/;
-      license = "GPL3";
+    description = "Image pixel format conversion library";
+    homepage = http://gegl.org/babl/;
+    license = "GPL3";
   };
 }
diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix
index 54bf2331bf7..419215a45a5 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/pkgs/development/libraries/boolstuff/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig }:
+
 stdenv.mkDerivation {
   name = "boolstuff-0.1.12";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0h39civar6fjswaf3bn1r2ddj589rya0prd6gzsyv3qzr9srprq9";
   };
 
-  buildInputs = [pkgconfig];
+  buildInputs = [ pkgconfig ];
 
   meta = { 
-    description = "operations on boolean expression binary trees";
+    description = "Library for operations on boolean expression binary trees";
     homepage = http://perso.b2b2c.ca/sarrazip/dev/boolstuff.html;
     license = "GPL";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index dc8bb2a9b52..5ca74561491 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -11,11 +11,11 @@ assert pngSupport -> libpng != null;
 assert xcbSupport -> libxcb != null && xcbutil != null;
 
 stdenv.mkDerivation rec {
-  name = "cairo-1.8.8";
+  name = "cairo-1.8.10";
   
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.gz";
-    sha256 = "140w8pz2k2kmjdaav3rfy009rjf2hqycsnk7lq0nwnf4bpgd6l9w";
+    sha1 = "fd5e8ca82ff0e8542ea4c51612cad387f2a49df3";
   };
 
   buildInputs =
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 5424e7a73de..11b8fba8b04 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }:
+
 stdenv.mkDerivation {
   name = "ccrtp-1.7.1";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0psi91r0fgawpa5x4jiq7lkr180agdi25gi0mfriqcmykxg7r1jn";
   };
 
-  buildInputs = [openssl pkgconfig libgcrypt commoncpp2];
+  buildInputs = [ openssl pkgconfig libgcrypt commoncpp2 ];
 
   meta = { 
     description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF";
     homepage = "http://www.gnu.org/software/ccrtp/";
     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/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix
new file mode 100644
index 00000000000..a40044ee3a3
--- /dev/null
+++ b/pkgs/development/libraries/clapack/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, cmake}:
+
+stdenv.mkDerivation rec {
+  name = "clapack-3.2.1";
+
+  src = fetchurl {
+    url = http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz;
+    sha256 = "0nnap9q1mv14g57dl3vkvxrdr10k5w7zzyxs6rgxhia8q8mphgqb";
+  };
+
+  buildNativeInputs = [ cmake ];
+
+  installPhase = ''
+    ensureDir $out/include $out/lib
+    cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib
+    cp ../INCLUDE/* $out/include
+  '';
+
+  doCheck = true;
+  checkPhase = "ctest";
+
+  meta = {
+    homepage = http://www.netlib.org/clapack/;
+    description = "f2c'ed version of LAPACK";
+    license = "BSD";
+  };
+}
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
new file mode 100644
index 00000000000..d2b123fade3
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -0,0 +1,25 @@
+{ fetchurl, stdenv, pkgconfig, clutter, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gtk-0.10.4";
+
+  src = fetchurl {
+    url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2";
+    sha256 = "04mrq5ddj24zhh7dvyp9bl8510wq7qpmy3rl3wiqwl9c43gahd01";
+  };
+
+  buildInputs = [ pkgconfig clutter gtk ];
+
+  preConfigure = "export V=1";
+
+  meta = {
+    description = "Clutter-GTK";
+
+    homepage = http://www.clutter-project.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
new file mode 100644
index 00000000000..f7f9507373d
--- /dev/null
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -0,0 +1,44 @@
+{ fetchurl, stdenv, pkgconfig, mesa, libXi, libXfixes, libXdamage
+, libXcomposite, cairo, glib, pango, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-1.2.10";
+
+  src = fetchurl {
+    url = "http://source.clutter-project.org/sources/clutter/1.2/${name}.tar.gz";
+    sha256 = "0bdnj026lqmwpgml73q4r0v90gsksjz0nv2fgjda9619bzx47igi";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  # There are all listed in the `Requires' field of `clutter-x11-1.0.pc'.
+  propagatedBuildInputs =
+    [ mesa cairo glib pango gtk
+      libXi libXfixes libXdamage libXcomposite
+    ];
+
+
+  meta = {
+    description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
+
+    longDescription =
+      '' Clutter is free software library for creating fast, compelling,
+         portable, and dynamic graphical user interfaces.  It is a core part
+         of MeeGo, and is supported by the open source community.  Its
+         development is sponsored by Intel.
+
+         Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
+         on mobile and embedded platforms), but wraps an easy to use,
+         efficient, flexible API around GL's complexity.
+
+         Clutter enforces no particular user interface style, but provides a
+         rich, generic foundation for higher-level toolkits tailored to
+         specific needs.
+      '';
+
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix
new file mode 100644
index 00000000000..7291aa5eb38
--- /dev/null
+++ b/pkgs/development/libraries/confuse/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "confuse-2.7";
+  src = fetchurl {
+    url = "http://savannah.nongnu.org/download/confuse/${name}.tar.gz";
+    sha256 = "0y47r2ashz44wvnxdb18ivpmj8nxhw3y9bf7v9w0g5byhgyp89g3";
+  };
+
+  meta = {
+    homepage = http://www.nongnu.org/confuse/;
+    description = "Configuration file parser library";
+    license = "BSD";
+  };
+}
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index a2cfcc45a4c..d22eb738671 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -9,13 +9,13 @@ stdenv.mkDerivation rec {
   };
 
   patches = [ ./pic.patch ]
-    ++ stdenv.lib.optional (builtins.currentSystem != "i686-cygwin") ./dll.patch;
+    ++ stdenv.lib.optional (stdenv.system != "i686-cygwin") ./dll.patch;
 
 
   buildInputs = [ unzip ]
 
     # For some reason the makefile sets "AR = libtool" on Darwin.
-    ++ stdenv.lib.optional (builtins.currentSystem == "i686-darwin") libtool;
+    ++ stdenv.lib.optional (stdenv.system == "i686-darwin") libtool;
 
   # Unpack the thing in a subdirectory.
   unpackPhase = ''
@@ -24,6 +24,17 @@ stdenv.mkDerivation rec {
     sourceRoot="$PWD/${name}"
   '';
 
+  cxxflags = if stdenv.isi686 then "-march=i686" else
+             if stdenv.isx86_64 then "-march=nocona" else
+             "";
+
+  configurePhase = ''
+    sed -i GNUmakefile \
+      -e 's|-march=native|${cxxflags}|g' \
+      -e 's|-mtune=native||g' \
+      -e '/^CXXFLAGS =/s|-g -O2|-O3|'
+  '';
+
   # Deal with one of the crappiest build system around there.
   buildPhase = ''
     # These guys forgot a file or something.
@@ -32,6 +43,8 @@ stdenv.mkDerivation rec {
     make PREFIX="$out" all cryptopp.dll
   '';
 
+  # TODO: Installing cryptotest.exe doesn't seem to be necessary. We run
+  # that binary during this build anyway to verify everything works.
   installPhase = ''
     mkdir "$out"
     make install PREFIX="$out"
diff --git a/pkgs/development/libraries/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix
index c30166d015c..950fe1baf08 100644
--- a/pkgs/development/libraries/ctl/default.nix
+++ b/pkgs/development/libraries/ctl/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, ilmbase }:
+
 stdenv.mkDerivation {
   name = "ctl-1.4.1";
 
@@ -7,8 +8,12 @@ stdenv.mkDerivation {
     sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
   };
 
-  propagatedBuildInputs =  [ilmbase];
-  configureFlags="--with-ilmbase-prefix=${ilmbase}";
+  patches = [ ./patch.patch ];
+  
+  propagatedBuildInputs = [ ilmbase ];
+  
+  configureFlags = "--with-ilmbase-prefix=${ilmbase}";
+  
   #configurePhase = "
     #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
     #echo $CXXFLAGS
@@ -16,10 +21,9 @@ stdenv.mkDerivation {
   #";
 
   meta = {
-      description = "Color Transformation Language";
-      homepage = http://ampasctl.sourceforge.net;
-      license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
+    description = "Color Transformation Language";
+    homepage = http://ampasctl.sourceforge.net;
+    license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
   };
 
-  patches = [ ./patch.patch ];
 }
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index a6d594af0f0..e21a5d66a0e 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -1,16 +1,16 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-glib-0.80";
+  name = "dbus-glib-0.86";
   
   src = fetchurl {
     url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
-    sha256 = "0nv4gxcbpa9f0907dmzmfm222w8y45z19cx27l85f5qknf8hncxm";
+    sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak";
   };
   
-  buildInputs = [pkgconfig expat gettext libiconv];
+  buildInputs = [ pkgconfig expat gettext libiconv ];
   
-  propagatedBuildInputs = [dbus.libs glib];
+  propagatedBuildInputs = [ dbus.libs glib ];
   
   passthru = { inherit dbus glib; };
 
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index b9d93184076..8f8766fb6cf 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,12 +1,14 @@
-{stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true}:
+{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
 
 let
-  version = "1.2.16";
+  version = "1.2.24";
   
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
-    sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln";
+    sha256 = "0j2wb79kndq4b1qqr59n1g6s0lm7yp6r9ny3skimadkh9a7p8b7i";
   };
+
+  patches = [ ./ignore-missing-includedirs.patch ];
   
   configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp";
   
@@ -15,11 +17,11 @@ in rec {
   libs = stdenv.mkDerivation {
     name = "dbus-library-" + version;
     
-    buildInputs = [pkgconfig expat];
+    buildInputs = [ pkgconfig expat ];
     
-    inherit src configureFlags;
+    inherit src patches configureFlags;
     
-    patchPhase =
+    preConfigure =
       ''
         sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in
         sed -i '/SUBDIRS/s/ tools//' Makefile.in
@@ -31,22 +33,22 @@ in rec {
   tools = stdenv.mkDerivation {
     name = "dbus-tools-" + version;
 
-    inherit src;
+    inherit src patches;
 
     configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin";
     
-    buildInputs = [pkgconfig expat libs]
-      ++ stdenv.lib.optionals useX11 [libX11 libICE libSM];
+    buildInputs = [ pkgconfig expat libs ]
+      ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ];
       
-    postConfigure = "cd tools";
-
     NIX_LDFLAGS = "-ldbus-1";
 
-    patchPhase =
+    preConfigure =
       ''
         sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
         substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
       '';
+
+    postConfigure = "cd tools";
   };
 
   # I'm too lazy to separate daemon and libs now.
diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
new file mode 100644
index 00000000000..2781f4ae3de
--- /dev/null
+++ b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
@@ -0,0 +1,23 @@
+diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c
+--- dbus-1.2.24-orig/bus/config-parser.c	2010-03-23 20:01:27.000000000 +0100
++++ dbus-1.2.24/bus/config-parser.c	2010-07-20 14:17:20.000000000 +0200
+@@ -2159,12 +2159,16 @@
+ 
+   retval = FALSE;
+   
+-  dir = _dbus_directory_open (dirname, error);
++  dbus_error_init (&tmp_error);
++  
++  dir = _dbus_directory_open (dirname, &tmp_error);
+ 
+   if (dir == NULL)
+-    goto failed;
++    {
++      retval = TRUE;
++      goto failed;
++    }
+ 
+-  dbus_error_init (&tmp_error);
+   while (_dbus_directory_get_next_file (dir, &filename, &tmp_error))
+     {
+       DBusString full_path;
diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix
new file mode 100644
index 00000000000..7ac4568a4e1
--- /dev/null
+++ b/pkgs/development/libraries/dotnetfx35/default.nix
@@ -0,0 +1,23 @@
+{stdenv}:
+
+let
+  windir = "/cygdrive/c/WINDOWS";
+in
+{
+  pkg = stdenv.mkDerivation {
+    name = "dotnetfx-3.5";
+    src = "${windir}/Microsoft.NET/Framework/v3.5";
+    buildCommand = ''
+      ensureDir $out/bin
+      ln -s $src/MSBuild.exe $out/bin
+    '';
+  };
+  
+  assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
+  
+  wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
+  
+  referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
+  
+  referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
+}
diff --git a/pkgs/development/libraries/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix
new file mode 100644
index 00000000000..ccc3318ff6b
--- /dev/null
+++ b/pkgs/development/libraries/esdl/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, SDL, mesa, erlang}:
+
+stdenv.mkDerivation rec {
+  name = "esdl-1.0.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/esdl/${name}.src.tar.gz";
+    sha256 = "0zc7cmr44v10sb593dismdm5qc2v7sm3z9yh22g4r9g6asbg5z0n";
+  };
+
+  buildInputs = [ erlang ];
+  propagatedBuildInputs = [ SDL mesa ];
+
+  preBuild = ''
+    export makeFlags="INSTALLDIR=$out/lib/erlang/addons/${name}";
+  '';
+
+  meta = {
+    homepage = http://esdl.sourceforge.net/;
+    description = "Erlang binding to SDL that includes a binding to OpenGL";
+    license = "BSD";
+  };
+}
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index d1c0a825dea..f133217b202 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -1,19 +1,20 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, autoconf, automake, libtool }:
+
+stdenv.mkDerivation {
   name = "faac-1.26";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/faac/faac-1.26.tar.gz;
     sha256 = "0ld9d8mn3yp90japzkqkicmjcggi7d8y9gn7cl1jdsb74bif4j2b";
   };
 
   preConfigure = "./bootstrap";
 
-  buildInputs =(with args; [autoconf automake libtool]);
+  buildInputs = [ autoconf automake libtool ];
 
   meta = {
-      description="open source MPEG-4 and MPEG-2 AAC encoder";
-      homepage = http://www.audiocoding.com/faac.html;
-      license = "LGPL";
+    description = "Open source MPEG-4 and MPEG-2 AAC encoder";
+    homepage = http://www.audiocoding.com/faac.html;
+    license = "LGPL";
   };
 }
diff --git a/pkgs/development/libraries/facile/default.nix b/pkgs/development/libraries/facile/default.nix
index 1890c6d0563..edbe99cd8b0 100644
--- a/pkgs/development/libraries/facile/default.nix
+++ b/pkgs/development/libraries/facile/default.nix
@@ -1,19 +1,26 @@
-args: with args;
+{ stdenv, fetchurl, ocaml }:
+
 stdenv.mkDerivation rec {
-	name = "facile-1.1";
-	src = fetchurl {
-		url = "${meta.homepage}/distrib/${name}.tar.gz";
-		sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8";
-	};
-	dontAddPrefix = 1;
-	patchPhase = "sed -e 's@mkdir@mkdir -p@' -i Makefile";
-	postConfigure = "make -C src .depend";
-	makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile";
-	buildInputs = [ocaml];
+  name = "facile-1.1";
+  
+  src = fetchurl {
+    url = "${meta.homepage}/distrib/${name}.tar.gz";
+    sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8";
+  };
+  
+  dontAddPrefix = 1;
+        
+  patchPhase = "sed -e 's@mkdir@mkdir -p@' -i Makefile";
+  
+  postConfigure = "make -C src .depend";
+  
+  makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile";
+  
+  buildInputs = [ ocaml ];
 
-	meta = {
-		homepage = http://www.recherche.enac.fr/log/facile;
-		license = "LGPL";
-		description = "A Functional Constraint Library";
-	};
+  meta = {
+    homepage = http://www.recherche.enac.fr/log/facile;
+    license = "LGPL";
+    description = "A Functional Constraint Library";
+  };
 }
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index 0af3e4f5537..81474b62dc6 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -1,18 +1,16 @@
-args:
-args.stdenv.mkDerivation rec {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
   name = "fcgi-2.4.0";
 
-  src = args.fetchurl {
-    name = name + ".tar.gz";
+  src = fetchurl {
     url = http://www.fastcgi.com/dist/fcgi.tar.gz;
     sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "FastCGI  is a language independent, scalable, open extension to CG";
-      homepage = http://www.fastcgi.com/;
-      license = "FastCGI see LICENSE.TERMS";
+    description = "FastCGI  is a language independent, scalable, open extension to CG";
+    homepage = http://www.fastcgi.com/;
+    license = "FastCGI see LICENSE.TERMS";
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index 2cc24d32c3a..01479564dd7 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore, lame, yasm}:
+{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore, lame, yasm
+, libvpx}:
 
 stdenv.mkDerivation {
-  name = "ffmpeg-0.5.1";
+  name = "ffmpeg-0.6";
   
   src = fetchurl {
-    url = http://www.ffmpeg.org/releases/ffmpeg-0.5.1.tar.bz2;
-    sha256 = "0n68lihyy3jk4q7f22kv6nranfbafyl41hnzpa6cm0r0vf473gn2";
+    url = http://www.ffmpeg.org/releases/ffmpeg-0.6.tar.bz2;
+    sha256 = "08419kg2i8j7x4mb3vm6a73fdszivj6lzh7lypxby30gfnkblc37";
   };
   
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
@@ -26,9 +27,10 @@ stdenv.mkDerivation {
     --enable-libxvid
     --enable-libmp3lame
     --enable-runtime-cpudetect
+    --enable-libvpx
   '';
 
-  buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore lame yasm];
+  buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore lame yasm libvpx];
 
   meta = {
     homepage = http://www.ffmpeg.org/;
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 9e362076d26..845ec772010 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -1,23 +1,31 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function { 
-		src = 
-			fetchurl {
-				url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.1.tar.gz;
-				sha256 = "1x8jww3vflrgzjrpnnsk0020bkd9aqmfga8y31v10cqd02l46sh7";
-			};
-		buildInputs = [];
-		configureFlags = ["--enable-shared"] 
-                     ++ (if args.singlePrecision then [ /*"--enable-single" */] else ["--enable-float"]);
-                          # some distros seem to be shipping both versions within the same package?
-                          # why does --enable-single still result in ..3f.so instead of ..3.so?
-	};
-	in with localDefs;
+{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false}:
+let localDefs = builderDefs.passthru.function { 
+  src = 
+    fetchurl {
+      url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.2.tar.gz;
+      sha256 = "13vnglardq413q2518zi4a8pam3znydrz28m9w09kss9xrjsx9va";
+    };
+  buildInputs = [];
+  configureFlags = ["--enable-shared" "--enable-openmp"]
+                        # some distros seem to be shipping both versions within the same package?
+                        # why does --enable-float still result in ..3f.so instead of ..3.so?
+                   ++ (if singlePrecision then [ "--enable-single" ] else [ ])
+                        # I think all i686 has sse
+                   ++ (if (stdenv.isi686 || stdenv.isx86_64) && singlePrecision then [ "--enable-sse" ] else [ ])
+                        # I think all x86_64 has sse2
+                   ++ (if stdenv.isx86_64 && ! singlePrecision then [ "--enable-sse2" ] else [ ]);
+                
+  };
+in with localDefs;
 stdenv.mkDerivation {
-	name = "fftw-3.2.1" + ( if args.singlePrecision then "-single" else "-float" );
-	builder = writeScript "fftw-3.2.1-builder"
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare]);
-	meta = {
-		description = "Fastest Fourier Transform in the West library";
-		inherit src;
-	};
+  name = "fftw-3.2.2" + ( if singlePrecision then "-single" else "-double" );
+  builder = writeScript "fftw-3.2.1-builder"
+    (textClosure localDefs [doConfigure doMakeInstall doForceShare]);
+  meta = {
+    description = "Fastest Fourier Transform in the West library";
+  };
+  passthru = {
+    # Allow instantiating "-A fftw.src"
+    inherit src;
+  };
 }
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index 1fb1cda3353..6b6cb2ba879 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -1,17 +1,19 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} rec {
+{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
+, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
 
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} rec {
   name = "fltk-2.0.x-r6970";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = "ftp://ftp.easysw.com/pub/fltk/snapshots/${name}.tar.bz2";
     sha256 = "0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3";
   };
 
-  propagatedBuildInputs=[x11 inputproto libXi freeglut];
+  propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  buildInputs = [ args.pkgconfig ];
+  buildInputs = [ pkgconfig ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?
@@ -28,18 +30,19 @@ composableDerivation {} rec {
     // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } #       turn on Xinerama support default=no
     // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } #            turn on Xft support default=no
     // edf { name = "xdbe"; };  #           turn on Xdbe support default=no
+
   cfg = {
-      largefileSupport = true; # is default
-      glSupport = true; # doesn't build without it. Why?
-      localjpegSupport = false;
-      localzlibSupport = false;
-      localpngSupport = false;
-      sharedSupport = true;
-      threadsSupport = true;
+    largefileSupport = true; # is default
+    glSupport = true; # doesn't build without it. Why?
+    localjpegSupport = false;
+    localzlibSupport = false;
+    localpngSupport = false;
+    sharedSupport = true;
+    threadsSupport = true;
   };
 
   meta = {
-      description = "a C++ cross platform lightweight gui library binding";
-      homepage = http://www.fltk.org;
+    description = "a C++ cross platform lightweight gui library binding";
+    homepage = http://www.fltk.org;
   };
 }
diff --git a/pkgs/development/libraries/fltk/fltk11.nix b/pkgs/development/libraries/fltk/fltk11.nix
index 41733862c17..118b24ec317 100644
--- a/pkgs/development/libraries/fltk/fltk11.nix
+++ b/pkgs/development/libraries/fltk/fltk11.nix
@@ -1,17 +1,19 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
+, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
 
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
   name = "fltk-1.1.10";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2;
     sha256 = "16mic69a48y3ybijml754x38djxxb25rn8441p9qsssqy8ms5b9p";
   };
 
-  propagatedBuildInputs=[x11 inputproto libXi freeglut];
+  propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
 
-  buildInputs = [ args.pkgconfig ];
+  buildInputs = [ pkgconfig ];
 
   flags =
     # this could be tidied up (?).. eg why does it require freeglut without glSupport?
@@ -28,18 +30,19 @@ composableDerivation {} {
     // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } #       turn on Xinerama support default=no
     // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } #            turn on Xft support default=no
     // edf { name = "xdbe"; };  #           turn on Xdbe support default=no
+
   cfg = {
-      largefileSupport = true; # is default
-      glSupport = true; # doesn't build without it. Why?
-      localjpegSupport = false;
-      localzlibSupport = false;
-      localpngSupport = false;
-      sharedSupport = true;
-      threadsSupport = true;
+    largefileSupport = true; # is default
+    glSupport = true; # doesn't build without it. Why?
+    localjpegSupport = false;
+    localzlibSupport = false;
+    localpngSupport = false;
+    sharedSupport = true;
+    threadsSupport = true;
   };
 
   meta = {
-      description = "a C++ cross platform lightweight gui library binding";
-      homepage = http://www.fltk.org;
+    description = "A C++ cross-platform light-weight GUI library binding";
+    homepage = http://www.fltk.org;
   };
 }
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 7e802eb86b8..8e016401e3d 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, freetype, expat}:
+{ stdenv, fetchurl, freetype, expat }:
 
 stdenv.mkDerivation rec {
-  name = "fontconfig-2.7.3";
+  name = "fontconfig-2.8.0";
   
   src = fetchurl {
     url = "http://fontconfig.org/release/${name}.tar.gz";
-    sha256 = "0l5hjifapv4v88a204ixg6w6xly81cji2cr65znra0vbbkqvz3xs";
+    sha256 = "0d9370qnn1qzq0jidbycin2frkcr1kqj04jbgb79ykb5x9p1qaps";
   };
   
-  buildInputs = [freetype];
-  propagatedBuildInputs = [expat]; # !!! shouldn't be necessary, but otherwise pango breaks
+  buildInputs = [ freetype ];
+  propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks
 
   configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
 
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index d3814bdb972..cac14642a3f 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,31 +1,29 @@
 { stdenv, fetchurl
-, # FreeType supports hinting using a TrueType bytecode interpreter,
-  # as well as sub-pixel rendering.  These are patented by Apple and
-  # Microsoft, respectively, so they are disabled by default.  This
-  # option allows them to be enabled.  See
-  # http://www.freetype.org/patents.html.
+, # FreeType supports sub-pixel rendering.  This is patented by
+  # Microsoft, so it is disabled by default.  This option allows it to
+  # be enabled.  See http://www.freetype.org/patents.html.
   useEncumberedCode ? false
 }:
 
-stdenv.mkDerivation (rec {
-  name = "freetype-2.3.11";
+stdenv.mkDerivation rec {
+  name = "freetype-2.4.1";
   
   src = fetchurl {
     url = "mirror://sourceforge/freetype/${name}.tar.bz2";
-    sha256 = "1j9f3q7vkdhlcxmfhkkyvxmniih2gcsb428v73mfk88qc0g3n0wa";
+    sha256 = "0gmyk6w7rbiiw7zjbyvkvp8wfl7q9n5576ifqq67qwsjdzlm9ja5";
   };
 
   configureFlags = "--disable-static";
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString useEncumberedCode
-    "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1 -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER=1";
+    "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1";
+
+  # The asm for armel is written with the 'asm' keyword.
+  CFLAGS = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "-std=gnu99";
 
   meta = {
     description = "A font rendering engine";
     homepage = http://www.freetype.org/;
     license = "GPLv2+"; # or the FreeType License (BSD + advertising clause)
   };
-} //
-# The asm for armel is written with the 'asm' keyword.
-(if (stdenv.system == "armv5tel-linux") then 
-    {CFLAGS = "-std=gnu99";} else {}))
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index 79356b31b7e..6c506df3f89 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/pkgs/development/libraries/gamin/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, python, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
   name = "gamin-0.1.9";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fgjfyr0nlkpdxj94a4qfm82wypljdyv1b6l56v7i9jdx0hcdqhr";
   };
 
-  buildInputs = [python pkgconfig glib];
+  buildInputs = [ python pkgconfig glib ];
 
   # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from
   # <sys/socket.h> with Glibc 2.9.
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index d3df5ce58d6..dde95364337 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,18 +1,15 @@
-args: with args;
-
-let inherit (args.composableDerivation) composableDerivation edf wwf; in
-
-composableDerivation {} ( fixed : {
+{ stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
+, postgresql, mysql, libgeotiff }:
 
+composableDerivation.composableDerivation {} (fixed: {
   name = "gdal-1.7.1";
 
-
   src = fetchurl {
     url = ftp://ftp.remotesensing.org/gdal/gdal171.zip;
     md5 = "f5592cff69b239166c9b64ff81943b1a";
   };
 
-  buildInputs = [unzip libjpeg];
+  buildInputs = [ unzip libjpeg ];
 
   # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults
   preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0";
@@ -27,78 +24,11 @@ composableDerivation {} ( fixed : {
     "--with-geotiff=${libgeotiff}"
   ];
 
-  /* TODO
-    # --with-grass=ARG      Include GRASS support (GRASS 5.7+, ARG=GRASS install tree dir)
-    # --with-libgrass=ARG   Include GRASS support based on libgrass (GRASS 5.0+)
-  --with-cfitsio=ARG    Include FITS support (ARG=no or libcfitsio path)
-  --with-pcraster=ARG   Include PCRaster (libcsf) support (ARG=internal, no or path)
-  --with-netcdf=ARG     Include netCDF support (ARG=no or netCDF tree prefix)
-  --with-png=ARG        Include PNG support (ARG=internal, no or path)
-  --with-pcidsk=ARG     Path to external PCIDSK SDK, or internal (default), or old
-  --with-libtiff=ARG    Libtiff library to use (ARG=internal, yes or path)
-  --with-jpeg=ARG       Include JPEG support (ARG=internal, no or path)
-  --without-jpeg12        Disable JPEG 8/12bit TIFF support
-  --with-gif=ARG        Include GIF support (ARG=internal, no or path)
-  --with-ogdi=ARG       Include OGDI support (ARG=path)
-  --with-fme=ARG        Include FMEObjects support (ARG=FME_HOME path)
-  --with-hdf4=ARG       Include HDF4 support (ARG=path)
-  --with-hdf5=ARG       Include HDF5 support (ARG=path)
-  --with-jasper=ARG     Include JPEG-2000 support via JasPer library (ARG=path)
-  --with-ecw=ARG        Include ECW support (ARG=ECW SDK Path, yes or no)
-  --with-kakadu=ARG     Include Kakadu/JPEG2000 support
-  --with-mrsid=ARG      Include MrSID support (ARG=path to MrSID DSDK or no)
-  --with-jp2mrsid=ARG   Enable MrSID JPEG2000 support (ARG=yes/no)
-  --with-msg=ARG          Enable MSG driver (ARG=yes or no)
-  --without-bsb           Disable BSB driver (legal issues pending
-  --with-oci=[ARG]        use Oracle OCI API from given Oracle home
-                          (ARG=path); use existing ORACLE_HOME (ARG=yes);
-                          disable Oracle OCI support (ARG=no)
-  --with-oci-include=[DIR]
-                          use Oracle OCI API headers from given path
-  --with-oci-lib=[DIR]    use Oracle OCI API libraries from given path
-  --without-grib          Disable GRIB driver
-  --without-ogr         Don't build OGR into shared library
-  --with-ingres=ARG     Include Ingres (ARG=$II_SYSTEM)
-  --with-xerces=[ARG]     use Xerces C++ Parser from given prefix (ARG=path);
-                          check standard prefixes (ARG=yes); disable (ARG=no)
-  --with-xerces-inc=[DIR] path to Xerces C++ Parser headers
-  --with-xerces-lib=[ARG] link options for Xerces C++ Parser libraries
-  --with-expat=[ARG]      use Expat XML Parser from given prefix (ARG=path);
-                          check standard prefixes (ARG=yes); disable (ARG=no)
-  --with-expat-inc=[DIR]  path to Expat XML Parser headers
-  --with-expat-lib=[ARG]  link options for Expat XML Parser libraries
-  --with-odbc=ARG       Include ODBC support (ARG=no or path)
-  --with-dods-root=ARG  Include DODS support (ARG=no or absolute path)
-  --with-curl=ARG       Include curl (ARG=path to curl-config.)
-  --with-spatialite=ARG Include SpatiaLite support (ARG=no or path)
-  --with-sqlite3=[ARG]    use SQLite 3 library [default=yes], optionally
-                          specify the prefix for sqlite3 library
-  --with-dwgdirect=path Include DWG direct support
-  --with-dwg-plt=platform DWGdirect Platform, defaults to lnxX86
-  --with-idb=DIR        Include Informix DataBlade support (DIR points to Informix root)
-  --with-sde=DIR        Include ESRI SDE support (DIR is SDE's install dir).
-  --with-sde-version=VERSION NUMBER  Set ESRI SDE version number (Default is 80).
-  --without-vfk         Disable VFK support
-  --with-epsilon=ARG    Include EPSILON support (ARG=no, yes or libepsilon install root path)
-  --with-geos=ARG         Include GEOS support (ARG=yes, no or geos-config
-                          path)
-  --without-pam         Disable PAM (.aux.xml) support
-  --with-static-proj4=ARG Compile with PROJ.4 statically (ARG=no or path)
-  --with-gdal-ver=ARG   Override GDAL version
-  --with-macosx-framework         Build and install GDAL as a Mac OS X Framework
-  --with-perl           Enable perl bindings
-  --with-php            Enable php bindings
-  --with-ruby           Enable Ruby bindings
-  --with-python       Enable python bindings
-  --with-pymoddir=ARG   Override Old-gen Python package install dir
-
-  */
-
   meta = {
-    description = "translator library for raster geospatial data formats";
+    description = "Translator library for raster geospatial data formats";
     homepage = http://www.gdal.org/;
     license = "X/MIT";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 })
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 5089316cd58..3b1900ae89c 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,19 +1,21 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
+, librsvg, pango, gtk }:
+        
+stdenv.mkDerivation {
   name = "gegl-0.0.22";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2;
     sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5";
   };
 
   configureFlags = "--disable-docs"; # needs fonts otherwise  don't know how to pass them
 
-  buildInputs =(with args; [pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk]  );
+  buildInputs = [ pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk ];
 
   meta = { 
-      description = "graph based image processing framework";
-      homepage = http://www.gegl.org;
-      license = "GPL3";
+    description = "Graph-based image processing framework";
+    homepage = http://www.gegl.org;
+    license = "GPL3";
   };
 }
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index cbb0c23e311..734bde71338 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,8 +1,8 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, fetchurl, python }:
 
-  buildInputs = [ "which" ]; # which is needed for the autogen.sh
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
 
   flags =
   # python and ruby untested 
@@ -13,8 +13,8 @@ composableDerivation {} {
   name = "geos-3.2.2";
 
   src = fetchurl {
-      url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2;
-      sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4";
+    url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2;
+    sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4";
   };
 
   # for development version. can be removed ?
@@ -26,10 +26,8 @@ composableDerivation {} {
   #";
 
   meta = {
-      description = "C++ port of the Java Topology Suite (JTS)"
-        + "- all the OpenGIS \"Simple Features for SQL\" spatial predicate functions and spatial operators,"
-        + " as well as specific JTS topology functions such as IsValid";
-      homepage = http://geos.refractions.net/;
-      license = "GPL";
+    description = "C++ port of the Java Topology Suite (JTS)";
+    homepage = http://geos.refractions.net/;
+    license = "GPL";
   };
 }
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index d53d011faba..6c76dafd572 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, mesa, x11, libXmu, libXi }:
 
 stdenv.mkDerivation {
   name = "glew-1.5.2";
@@ -8,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8";
   };
 
-  buildInputs = [mesa x11 libXmu libXi];
+  buildInputs = [ mesa x11 libXmu libXi ];
 
+  installPhase = "GLEW_DEST=\$out make install";
+  
   meta = { 
-    description = "cross-platform open-source C/C++ extension loading library";
+    description = "Cross-platform open-source C/C++ extension loading library";
     homepage = http://glew.sourceforge.net/;
     license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 
   };
-
-  installPhase="GLEW_DEST=\$out make install";
 }
diff --git a/pkgs/development/libraries/glefw/default.nix b/pkgs/development/libraries/glfw/default.nix
index bf4d0f504de..1454d2ec94a 100644
--- a/pkgs/development/libraries/glefw/default.nix
+++ b/pkgs/development/libraries/glfw/default.nix
@@ -1,27 +1,27 @@
-args: with args;
+{ stdenv, fetchurl, mesa, libX11, libXext }:
 
 stdenv.mkDerivation {
-  name = "glefw-2.6";
+  name = "glfw-2.6";
 
   src = fetchurl {
     url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2;
     sha256 = "1jnz7szax7410qrkiwkvq34sxy11w46ybyqbkaczdyvqas6cm1hv";
   };
 
-  buildInputs = [mesa libX11 libXext];
+  buildInputs = [ mesa libX11 libXext ];
 
   buildPhase = ''
     ensureDir $out
     make x11-install PREFIX=$out
   '';
   
-  installPhase=":";
+  installPhase = ":";
 
   meta = { 
-    description = "multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
+    description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
     homepage = http://glfw.sourceforge.net/;
     license = "zlib/libpng"; # http://www.opensource.org/licenses/zlib-license.php
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/glib/2.22.x.nix b/pkgs/development/libraries/glib/2.22.x.nix
index e6af08cae0e..9148639c2d0 100644
--- a/pkgs/development/libraries/glib/2.22.x.nix
+++ b/pkgs/development/libraries/glib/2.22.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null}:
 
 stdenv.mkDerivation rec {
-  name = "glib-2.22.4";
+  name = "glib-2.22.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2";
-    sha256 = "055dv2hymbyzwpcd39r97x747vsvlkyywa826zr75dzambw6n7qd";
+    sha256 = "802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b";
   };
 
   buildInputs = [pkgconfig gettext perl libiconv];
diff --git a/pkgs/development/libraries/glib/2.24.x.nix b/pkgs/development/libraries/glib/2.24.x.nix
new file mode 100644
index 00000000000..6fdb18e9b4d
--- /dev/null
+++ b/pkgs/development/libraries/glib/2.24.x.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "glib-2.24.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/glib/2.24/${name}.tar.bz2";
+    sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04";
+  };
+
+  buildInputs = [ pkgconfig gettext perl libiconv ];
+
+  propagatedBuildInputs = [ zlib ];
+
+  meta = {
+    description = "GLib, a C library of programming buildings blocks";
+
+    longDescription = ''
+      GLib provides the core application building blocks for libraries
+      and applications written in C.  It provides the core object
+      system used in GNOME, the main loop implementation, and a large
+      set of utility functions for strings and common data structures.
+    '';
+
+    homepage = http://www.gtk.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix
index 5a76566c7bc..29b70f99e0c 100644
--- a/pkgs/development/libraries/glibc-2.11/common.nix
+++ b/pkgs/development/libraries/glibc-2.11/common.nix
@@ -10,8 +10,9 @@ cross :
 , preConfigure ? "", ... }@args :
 
 let
-  date = "2010-05-12";
-  rev = "tschwinge/Roger_Whittaker@{${date}}";
+  # For GNU/Hurd, see below.
+  date = "20100512";
+  rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f";
   version = if hurdHeaders != null then date else "2.11.1";
 in
 
diff --git a/pkgs/development/libraries/gmime/2.2.x.nix b/pkgs/development/libraries/gmime/2.2.x.nix
new file mode 100644
index 00000000000..dc95dd2019d
--- /dev/null
+++ b/pkgs/development/libraries/gmime/2.2.x.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, glib, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "gmime-2.2.26";
+  
+  src = fetchurl {
+    url = "mirror://gnome/sources/gmime/2.2/${name}.tar.gz";
+    sha256 = "16inhq6symym9n71kxcndjwrxs2xrz63idvy64yc486wlg54aqfc";
+  };
+  
+  buildInputs = [ pkgconfig glib zlib ];
+
+  meta = {
+    homepage = http://spruce.sourceforge.net/gmime/;
+    description = "A C/C++ library for manipulating MIME messages";
+  };
+}
diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index 078d7e500b8..bd94a2633d4 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl, pkgconfig, glib, zlib}:
+{ stdenv, fetchurl, pkgconfig, glib, zlib }:
 
-stdenv.mkDerivation {
-  name = "gmime-2.4.15";
+stdenv.mkDerivation rec {
+  name = "gmime-2.4.17";
+  
   src = fetchurl {
-    url = http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.4/gmime-2.4.15.tar.bz2;
-    sha256 = "a0a6c9413b057ab5d8a2a2902cbaa5b3a17871af3f94dc8431978c9e0e5f53e1";
+    url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz";
+    sha256 = "1l1pbk0yrr7zwl90aabdhw0f9i4m6ragsfyk5qwg0hzk21abz9wd";
+  };
+  
+  buildInputs = [ pkgconfig glib zlib ];
+
+  meta = {
+    homepage = http://spruce.sourceforge.net/gmime/;
+    description = "A C/C++ library for manipulating MIME messages";
   };
-  buildInputs = [pkgconfig glib zlib];
 }
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 56b51d71ca6..f87211195d5 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -1,17 +1,16 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "gmm-3.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://download.gna.org/getfem/stable/gmm-3.0.tar.gz;
     sha256 = "1lc34w68s0rhii6caklvq2pyc3jaa4g6kza948ya8ha6rr8d1ypp";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "generic C++ template library for sparse, dense and skyline matrices";
-      homepage = http://home.gna.org/getfem/gmm_intro.html;
-      license = "LGLP2.1"; # or later
+    description = "Generic C++ template library for sparse, dense and skyline matrices";
+    homepage = http://home.gna.org/getfem/gmm_intro.html;
+    license = "LGLP2.1"; # or later
   };
 }
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index b5b385ee20a..64a73084d30 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -5,11 +5,11 @@ assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
 
-  name = "gnutls-2.8.6";
+  name = "gnutls-2.10.0";
 
   src = fetchurl {
     url = "mirror://gnu/gnutls/${name}.tar.bz2";
-    sha256 = "0mm3i2b6pvchx4cxgg0c2xkvflv9wz75vmpbk8nfxwsa0skldy6n";
+    sha256 = "124cysx5rxpgi9sxw7yx9hlb8900l4nx2kar6gcnvgs3w4y695l5";
   };
 
   configurePhase = ''
diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix
index 4bec18e7eca..45442072d39 100644
--- a/pkgs/development/libraries/goocanvas/default.nix
+++ b/pkgs/development/libraries/goocanvas/default.nix
@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, gtk, cairo, glib, pkgconfig }:
+
+stdenv.mkDerivation {
   name = "goocanvas-0.10";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/goocanvas/goocanvas-0.10.tar.gz;
     sha256 = "0b49szbr3n7vpavly9w17ipa8q3ydicdcd177vxbdvbsnvg7aqp9";
   };
 
-  buildInputs =(with args; [gtk cairo glib pkgconfig]);
+  buildInputs = [ gtk cairo glib pkgconfig ];
 
   meta = { 
-      description = "canvas widget for GTK+ using the cairo 2D library";
-      homepage = http://goocanvas.sourceforge.net/;
-      license = ["GPL" "LGPL"];
+    description = "Canvas widget for GTK+ based on the the Cairo 2D library";
+    homepage = http://goocanvas.sourceforge.net/;
+    license = ["GPL" "LGPL"];
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
index f60d40cfa03..c45af907aab 100644
--- a/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2, ... }:
+{ fetchurl, stdenv, pkgconfig, gstPluginsBase, bzip2 }:
 
 stdenv.mkDerivation rec {
   name = "gst-ffmpeg-0.10.9";
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
index d506cfe4e6a..37d0a058fff 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, python, gstreamer
 , libX11, libXv, libXext, alsaLib, cdparanoia , libogg
 , libtheora, libvorbis, freetype, pango
-, liboil, gtk, which, gtkdoc, ... }:
+, liboil, gtk, which, gtkdoc }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-base-0.10.26";
diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
index da4045a9d21..2998c89a51e 100644
--- a/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/gst-plugins-good/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gstPluginsBase, aalib, cairo
 , flac , hal, libjpeg, zlib, speex, libpng, libdv, libcaca, dbus
 , libiec61883, libavc1394, ladspaH, taglib, gdbm, pulseaudio
-, libsoup, libcap, libtasn1, ...
+, libsoup, libcap, libtasn1
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
index 435a80f05c7..91a699f564f 100644
--- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, perl, bison, flex, pkgconfig, python
-, which, gtkdoc, glib, libxml2, ... }:
+, which, gtkdoc, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gstreamer-0.10.26";
diff --git a/pkgs/development/libraries/gtk+/2.18.x.nix b/pkgs/development/libraries/gtk+/2.18.x.nix
index bb329ae8b14..40ba6e13b22 100644
--- a/pkgs/development/libraries/gtk+/2.18.x.nix
+++ b/pkgs/development/libraries/gtk+/2.18.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.18.6";
+  name = "gtk+-2.18.9";
   
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2";
-    sha256 = "0k9mz46q97537kdpmz8j5bhrzpn3zjp7k4mni4niafdp2x4r8aan";
+    sha256 = "5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4";
   };
   
   buildNativeInputs = [ perl ];
diff --git a/pkgs/development/libraries/gtk+/2.20.x.nix b/pkgs/development/libraries/gtk+/2.20.x.nix
new file mode 100644
index 00000000000..38537aae595
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/2.20.x.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg
+, libpng, cairo, perl, jasper, xlibs
+, xineramaSupport ? true
+, cupsSupport ? true, cups ? null
+}:
+
+assert xineramaSupport -> xlibs.libXinerama != null;
+assert cupsSupport -> cups != null;
+
+stdenv.mkDerivation rec {
+  name = "gtk+-2.20.1";
+  
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtk+/2.20/${name}.tar.bz2";
+    sha256 = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65";
+  };
+  
+  buildNativeInputs = [ perl ];
+  buildInputs = [ pkgconfig jasper ];
+  
+  propagatedBuildInputs =
+    [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ]
+    ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
+    ++ stdenv.lib.optionals cupsSupport [ cups ];
+
+  passthru = { inherit libtiff libjpeg libpng; };
+
+  meta = {
+    description = "A multi-platform toolkit for creating graphical user interfaces";
+
+    longDescription = ''
+      GTK+ is a highly usable, feature rich toolkit for creating
+      graphical user interfaces which boasts cross platform
+      compatibility and an easy to use API.  GTK+ it is written in C,
+      but has bindings to many other popular programming languages
+      such as C++, Python and C# among others.  GTK+ is licensed
+      under the GNU LGPL 2.1 allowing development of both free and
+      proprietary software with GTK+ without any license fees or
+      royalties.
+    '';
+
+    homepage = http://www.gtk.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp-2/default.nix
index cd2adfdd66b..7ffc918f678 100644
--- a/pkgs/development/libraries/gtk-sharp-2/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-2/default.nix
@@ -16,15 +16,15 @@
 }:
 
 stdenv.mkDerivation {
-  name = "gtk-sharp-1.9.2";
+  name = "gtk-sharp-2.12.10";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nixos.org/tarballs/gtk-sharp-1.9.2.tar.gz;
-    md5 = "b7c5afab5f736ffa4011974302831363";
+    url = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz;
+    sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc";
   };
 
-  patches = [ ./dllmap-glue.patch ];
+  # patches = [ ./dllmap-glue.patch ];
 
   buildInputs = [
     pkgconfig mono glib pango gtk GConf libglade libgnomecanvas
@@ -32,5 +32,11 @@ stdenv.mkDerivation {
     gnomepanel
   ];
 
+  dontStrip = true;
+
   inherit monoDLLFixer;
+
+  passthru = {
+    inherit gtk;
+  };
 }
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index cd77b5d6293..8df52cf2a27 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, e2fsprogs }:
  
 stdenv.mkDerivation {
   name = "gupnp-0.12";
@@ -8,10 +8,5 @@ stdenv.mkDerivation {
     sha256 = "1sm1rqvx752nb3j1yl7h30kx2ymndkji8m73fxshjssmc6z40ayg";
   };
 
-  buildInputs = [
-    pkgconfig glib libxml2 gssdp libsoup e2fsprogs
- #dbus.libs dbus_glib gtk glib
-  ];
-
-  #configureFlags="";
+  buildInputs = [ pkgconfig glib libxml2 gssdp libsoup e2fsprogs ];
 }
diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
index 9fa0690ad6b..0b0b04b2a90 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "GLUT";
-  version = "2.1.2.1"; # Haskell Platform 2010.1.0.0
+  version = "2.1.2.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264";
   propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa];
   meta = {
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
index 0600a957883..23b09543707 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "HTTP";
-  version = "4000.0.9"; # Haskell Platform 2010.1.0.0
+  version = "4000.0.9"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba";
   propagatedBuildInputs = [mtl network parsec];
   meta = {
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
index 9f52ed4048f..a2cd4665e79 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "HUnit";
-  version = "1.2.2.1"; # Haskell Platform 2010.1.0.0
+  version = "1.2.2.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853";
   meta = {
     description = "A unit testing framework for Haskell";
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
new file mode 100644
index 00000000000..8e228bef5ef
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl, extensibleExceptions} :
+
+cabal.mkDerivation (self : {
+  pname = "MonadCatchIO-mtl";
+  version = "0.3.0.1";
+  sha256 = "56113319439a10e338b2e3169e1df575024fbaf97827511f4856e46efbac9a07";
+  propagatedBuildInputs = [mtl extensibleExceptions];
+  meta = {
+    description = "Monad-transformer version of the Control.Exception module";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
new file mode 100644
index 00000000000..665e1687ac0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
@@ -0,0 +1,12 @@
+{cabal, transformers, extensibleExceptions} :
+
+cabal.mkDerivation (self : {
+  pname = "MonadCatchIO-transformers";
+  version = "0.2.2.0";
+  sha256 = "7f3b45ac01ac98476d1305333435005a6876e5c04c562e94ad2426ee7ab6936d";
+  propagatedBuildInputs = [transformers extensibleExceptions];
+  meta = {
+    description = "Monad-transformer compatible version of the Control.Exception module";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
index e3cb4bdf4e6..46e0fd0dad7 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "OpenGL";
-  version = "2.2.3.0"; # Haskell Platform 2010.1.0.0
+  version = "2.2.3.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502";
   propagatedBuildInputs = [mesa libX11];
   meta = {
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
new file mode 100644
index 00000000000..6ad15d15380
--- /dev/null
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
@@ -0,0 +1,14 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "QuickCheck";
+  version = "2.1.0.3"; # Haskell Platform 2010.1.0.0
+  sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Automatic testing of Haskell programs";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
index 6ad15d15380..f4463394ea1 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.3"; # Haskell Platform 2010.1.0.0
-  sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1";
+  version = "2.1.1.1"; # Haskell Platform 2010.2.0.0
+  sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9";
   propagatedBuildInputs = [mtl];
   meta = {
     description = "Automatic testing of Haskell programs";
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
new file mode 100644
index 00000000000..5c9cfeb114a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -0,0 +1,13 @@
+{cabal, text}:
+
+cabal.mkDerivation (self : {
+  pname = "blaze-html";
+  version = "0.1.2";
+  sha256 = "c1e65e3d23e90a3830ceee69ecfac65c7a8a045da06443fb7690609a59480f5f";
+  propagatedBuildInputs = [text];
+  meta = {
+    description = "A blazingly fast HTML combinator library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index fc719e032ac..87e2563bc7b 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -54,9 +54,12 @@
                 test -f $i && ghc --make $i
               done
 
-              for p in $propagatedBuildNativeInputs; do
+              for p in $extraBuildInputs $propagatedBuildNativeInputs; do
+                if [ -d "$p/include" ]; then
+                  extraLibDirs="$extraLibDirs --extra-include-dir=$p/include"
+                fi
                 for d in lib{,64}; do
-                  if [ -e "$p/$d" ]; then
+                  if [ -d "$p/$d" ]; then
                     extraLibDirs="$extraLibDirs --extra-lib-dir=$p/$d"
                   fi
                 done
diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
new file mode 100644
index 00000000000..df4cdf5b464
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -0,0 +1,14 @@
+{cabal, gtk2hsBuildtools, pkgconfig, glibc, cairo, zlib, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "cairo";
+  version = "0.11.0";
+  sha256 = "f7971180bbd40c2a19b2e97fe40bd4a296b3aaf3edcf6621009780d723405c5a";
+  extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools];
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Binding to the Cairo library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix
new file mode 100644
index 00000000000..2cbd4a5fe45
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cereal/default.nix
@@ -0,0 +1,12 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "cereal";
+  version = "0.2";
+  sha256 = "aa00eb88cea5616a0eb9e4b6604cb164b8bef6e86b111cbb67d51d4d3441332b";
+  meta = {
+    description = "A binary serialization library";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
new file mode 100644
index 00000000000..d425e84d692
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
@@ -0,0 +1,12 @@
+{cabal, mtl, network, parsec, xhtml}:
+
+cabal.mkDerivation (self : {
+  pname = "cgi";
+  version = "3001.1.7.3"; # Haskell Platform 2010.2.0.0
+  sha256 = "f1f4bc6b06e8a191db4ddb43617fee3ef37635e380d6a17c29efb5641ce91df0";
+  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
index 6658f86de75..eb84d629fdb 100644
--- a/pkgs/development/libraries/haskell/deepseq/default.nix
+++ b/pkgs/development/libraries/haskell/deepseq/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "deepseq";
-  version = "1.1.0.0"; # Haskell Platform 2010.1.0.0
+  version = "1.1.0.0"; # Haskell Platform 2010.1.0.0 and 2010.2.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/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
new file mode 100644
index 00000000000..0c326683a4f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "fgl";
+  version = "5.4.2.3"; # Haskell Platform 2010.2.0.0
+  sha256 = "e72142b555a5ab6c5cdced317b42e8cafdbb54b7e2e46ed14e6ca18d71d486b8";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Martin Erwig's Functional Graph Library";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
new file mode 100644
index 00000000000..07b55c1aaa7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -0,0 +1,12 @@
+{cabal, mtl, MonadCatchIOMtl} :
+
+cabal.mkDerivation (self : {
+  pname = "ghc-mtl";
+  version = "1.0.1.0";
+  sha256 = "5284e0ecf99511e6263503412faf6fa809dc577c009fde63203d46405eb1b191";
+  propagatedBuildInputs = [mtl MonadCatchIOMtl];
+  meta = {
+    description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
new file mode 100644
index 00000000000..41a3ac41e54
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -0,0 +1,13 @@
+{cabal, alex, happy}:
+
+cabal.mkDerivation (self : {
+  pname = "gtk2hs-buildtools";
+  version = "0.9";
+  sha256 = "2586c419394601c1840d827d32cdb9d76bc94d71c03fdfa23c8d04cba99c6b20";
+  extraBuildInputs = [alex happy];
+  meta = {
+    description = "Tools to build the Gtk2Hs suite of User Interface libraries";
+    license = "GPL";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/gtk2hs/default.nix b/pkgs/development/libraries/haskell/gtk2hs/default.nix
index 6409af3de2c..b58e3e928d7 100644
--- a/pkgs/development/libraries/haskell/gtk2hs/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome, cairo, ghc, mtl }:
 
-let gtksourceview = gnome.gtksourceview_24; in
-
 stdenv.mkDerivation rec {
   pname = "gtk2hs";
   version = "0.10.0";
@@ -17,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig cairo ghc gnome.glib gnome.gtk gnome.libglade
-    gnome.GConf gtksourceview gnome.librsvg
+    gnome.GConf gnome.gtksourceview gnome.librsvg
   ];
 
   preConfigure =
@@ -42,5 +40,5 @@ stdenv.mkDerivation rec {
       done
     ''; # */
 
-  passthru = { inherit gtksourceview; };
+  passthru = { inherit (gnome) gtksourceview; };
 }
diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
new file mode 100644
index 00000000000..08f7fd7b6a2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -0,0 +1,13 @@
+{cabal, blazeHtml, parsec, utf8String}:
+
+cabal.mkDerivation (self : {
+  pname = "hamlet";
+  version = "0.4.0";
+  sha256 = "5e05879e734fc193acc48eda48dadbf53659e937543068bcc77dc7c394f6adcd";
+  propagatedBuildInputs = [blazeHtml parsec utf8String];
+  meta = {
+    description = "Haml-like template files that are compile-time checked";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix
index ff89b3b8f10..fb096838ed4 100644
--- a/pkgs/development/libraries/haskell/hashed-storage/default.nix
+++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix
@@ -2,12 +2,11 @@
 
 cabal.mkDerivation (self : {
   pname = "hashed-storage";
-  version = "0.4.11";
-  sha256 = "c719f9b86c5a517324ce3448fcb4b6377ccbfa085268b396bec47b8bbcfbde1b";
+  version = "0.4.13";
+  sha256 = "c4e8dbd23469cde19696344f3e56088313ce5ee823e2d89ad2d0cb1fce602b63";
   propagatedBuildInputs = [mtl zlib mmap binary dataenc];
   meta = {
     description = "Hashed file storage support code";
     maintainers = [self.stdenv.lib.maintainers.andres];
   };
-})  
-
+})
diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
index 87b5173620c..87b5173620c 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
new file mode 100644
index 00000000000..5e39d3ddffb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
@@ -0,0 +1,22 @@
+{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.2.0.0";
+  src = fetchurl {
+    url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
+    sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0";
+  };
+  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";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/haskell-src/default.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix
index 365138b28a7..0cc7e888a20 100644
--- a/pkgs/development/libraries/haskell/haskell-src/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "haskell-src";
-  version = "1.0.1.3"; # Haskell Platform 2009.0.0
+  version = "1.0.1.3"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0
   sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89";
   extraBuildInputs = [happy];
   meta = {
diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
new file mode 100644
index 00000000000..17a5518c721
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -0,0 +1,16 @@
+{cabal, extensibleExceptions, filepath, ghcMtl,
+ ghcPaths, haskellSrc, MonadCatchIOMtl, mtl, utf8String} :
+
+cabal.mkDerivation (self : {
+  pname = "hint";
+  version = "0.3.2.3";
+  sha256 = "1cc01037cfd32eb1a299ce625487411a97ce70178778d7bbd1d5fcef7d3d40c4";
+  propagatedBuildInputs = [
+    extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
+    MonadCatchIOMtl mtl utf8String
+  ];
+  meta = {
+    description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/html/default.nix b/pkgs/development/libraries/haskell/html/default.nix
index 024985c8269..3540d397778 100644
--- a/pkgs/development/libraries/haskell/html/default.nix
+++ b/pkgs/development/libraries/haskell/html/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "html";
-  version = "1.0.1.2"; # Haskell Platform 2009.0.0
+  version = "1.0.1.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0
   sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061";
   meta = {
     description = "HTML combinator library";
diff --git a/pkgs/development/libraries/haskell/mtl/default.nix b/pkgs/development/libraries/haskell/mtl/default.nix
index 6c8b1cf960d..f06f92976b3 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 and 2010.1.0.0
+  version = "1.1.0.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.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
index e04af7a932b..6c740b0ef05 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "network";
-  version = "2.2.1.7"; # Haskell Platform 2010.1.0.0
+  version = "2.2.1.7"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58";
   propagatedBuildInputs = [parsec];
   meta = {
diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
index 38ec8247076..7cec49c9e53 100644
--- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "parallel";
-  version = "2.2.0.1"; # Haskell Platform 2010.1.0.0
+  version = "2.2.0.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd";
   propagatedBuildInputs = [deepseq];
   meta = {
diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/default.nix
index b0dcf5ef0e4..8b8827bfa06 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 and 2010.1.0.0
+  version = "2.1.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0
   sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df";
   meta = {
     description = "Monadic parser combinators";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
new file mode 100644
index 00000000000..f8b733664d5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -0,0 +1,17 @@
+{cabal, blazeHtml, MonadCatchIOTransformers, parsec, text, transformers,
+ utf8String, webRoutesQuasi}:
+
+cabal.mkDerivation (self : {
+  pname = "persistent";
+  version = "0.1.0";
+  sha256 = "32379f5ef937da1bf910cfaf9b6cce6326b8fba7554ef81159e6684c7ce2ca45";
+  propagatedBuildInputs = [
+    blazeHtml MonadCatchIOTransformers parsec text transformers
+    utf8String webRoutesQuasi
+  ];
+  meta = {
+    description = "Type-safe, non-relational, multi-backend persistence";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
new file mode 100644
index 00000000000..3f9d23e9533
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-base";
+  version = "0.93.2"; # Haskell Platform 2010.2.0.0
+  sha256 = "20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Replaces/Ehances Text.Regex";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
new file mode 100644
index 00000000000..749e6baaf73
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
@@ -0,0 +1,12 @@
+{cabal, regexBase, regexPosix}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-compat";
+  version = "0.93.1"; # Haskell Platform 2010.2.0.0
+  sha256 = "ee0374f780378e8c04a63d9cbaca525e116dbe2bdce4cff3abaffc28d4e99afe";
+  propagatedBuildInputs = [regexBase regexPosix];
+  meta = {
+    description = "Replaces/Enhances Text.Regex";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
new file mode 100644
index 00000000000..871805c63f0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
@@ -0,0 +1,12 @@
+{cabal, regexBase}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-posix";
+  version = "0.94.2"; # Haskell Platform 2010.2.0.0
+  sha256 = "ea0c1ed0ab49ade4dba1eea7a42197652ccb18b7a98c4040e37ba11d26f33067";
+  propagatedBuildInputs = [regexBase];
+  meta = {
+    description = "Replaces/Enhances Text.Regex";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index 7a43c50a6a6..5f939fbd1ea 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "regular";
-  version = "0.2.1";
-  sha256 = "732de15c4687b34a2702d38975581c8ab32167a76cd3c40cd4886bca0fc8b762";
+  version = "0.2.4";
+  sha256 = "7fcef09b09b2bb8cb32246b96d659f8102fd749b6f064cd7b813835ce947932c";
   meta = {
     description = "Generic programming library for regular datatypes";
     license = "BSD";
diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
new file mode 100644
index 00000000000..976f0054a4a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "stm";
+  version = "2.1.2.1"; # Haskell Platform 2010.2.0.0
+  sha256 = "0d7d8babd2f07c726909030461e1f9b3aaf02dc809fd5e1c0509a67d23b784b8";
+  meta = {
+    description = "Software Transactional Memory";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/transformers/default.nix b/pkgs/development/libraries/haskell/transformers/default.nix
index d5c933c7884..ef2c7ed74a7 100644
--- a/pkgs/development/libraries/haskell/transformers/default.nix
+++ b/pkgs/development/libraries/haskell/transformers/default.nix
@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self : {
   pname = "transformers";
-  version = "0.1.4.0";
-  sha256 = "6d222d1cbed75063753a7c828d7f429f24974d261872c7b70fe90a003c93646d";
+  version = "0.2.1.0";
+  sha256 = "1ff9768e60130810e888452b6052d64998d0651fe2835902f032d8f8182a2c6d";
   meta = {
-    description = "Concrete monad transformers";
+    description = "Concrete functor and monad transformers";
   };
 })  
 
diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
index 6df06579942..421e23aa561 100644
--- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "uu-parsinglib";
-  version = "2.3.1";
-  sha256 = "63ed4257f360a861b13f3e0edad6c17bbad90a0e3e031de49ed4d13a1ace98d2";
+  version = "2.3.4";
+  sha256 = "c5faeade06f363c2e7b95a2b7eeba752bf2dd1f4ff0cebbe09aaef9b79f8fdb2";
   meta = {
     description = "New version of the Utrecht University parser combinator library";
   };
diff --git a/pkgs/development/libraries/haskell/web-routes-quasi/default.nix b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
new file mode 100644
index 00000000000..8d0303d65bb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/web-routes-quasi/default.nix
@@ -0,0 +1,13 @@
+{cabal, webRoutes}:
+
+cabal.mkDerivation (self : {
+  pname = "web-routes-quasi";
+  version = "0.5.0";
+  sha256 = "07ef2717b44f92bccee9af4b4d9a173c12ec3b3b1d49a8495811dad0af240673";
+  propagatedBuildInputs = [webRoutes];
+  meta = {
+    description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
new file mode 100644
index 00000000000..cbd476ff7d0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@@ -0,0 +1,13 @@
+{cabal, network, parsec, utf8String}:
+
+cabal.mkDerivation (self : {
+  pname = "web-routes";
+  version = "0.22.0";
+  sha256 = "6482ecba585cf7b1f32c29bfd5cb6f5e06dba72231e38ae5baa15b6b95f7c6c8";
+  propagatedBuildInputs = [network parsec utf8String];
+  meta = {
+    description = "Library for maintaining correctness and composability of URLs within an application";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/xhtml/default.nix b/pkgs/development/libraries/haskell/xhtml/default.nix
index c09ed444d3e..78dc8486a81 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 and 2010.1.0.0
+  version = "3000.2.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.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
index d97e18ccf23..80bf428c706 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "zlib";
-  version = "0.5.2.0"; # Haskell Platform 2010.1.0.0
+  version = "0.5.2.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f";
   # TODO: find out exactly why propagated is needed here (to build other
   # packages depending on zlib):
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
new file mode 100644
index 00000000000..1eb9b9c1338
--- /dev/null
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, ncurses, readline }:
+
+stdenv.mkDerivation rec {
+  name = "hunspell-1.2.11";
+
+  src = fetchurl {
+    url = "mirror://sf/hunspell/${name}.tar.gz";
+    sha256 = "14vfs1qb01hq30ss1bsiv6lkx673695g0xdyisrq720fdq2mr5rz";
+  };
+
+  propagatedBuildInputs = [ ncurses readline ];
+  configureFlags = "--with-ui --with-readline";
+
+  meta = with stdenv.lib; {
+    homepage = http://hunspell.sourceforge.net;
+    description = "The spell checker of OpenOffice.org and Mozilla Firefox 3 & Thunderbird, Google Chrome etc.";
+    longDescription = ''
+      Main features:
+      * Extended support for language peculiarities; Unicode character encoding, compounding and complex morphology.
+      * Improved suggestion using n-gram similarity, rule and dictionary based pronounciation data.
+      * Morphological analysis, stemming and generation.
+      * Hunspell is based on MySpell and works also with MySpell dictionaries.
+      * C++ library under GPL/LGPL/MPL tri-license.
+      * Interfaces and ports:
+        * Enchant (Generic spelling library from the Abiword project),
+        * XSpell (Mac OS X port, but Hunspell is part of the OS X from version 10.6 (Snow Leopard), and
+            now it is enough to place Hunspell dictionary files into
+            ~/Library/Spelling or /Library/Spelling for spell checking),
+        * Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO.
+    '';
+    platforms = platforms.all;
+    maintainers = [ maintainers.urkud ];
+  };
+}
diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix
index 36b74a1980e..6dea424075d 100644
--- a/pkgs/development/libraries/ilbc/default.nix
+++ b/pkgs/development/libraries/ilbc/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, msilbc }:
 
 stdenv.mkDerivation {
   name = "ilbc-rfc3951";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   src = stdenv.mkDerivation {
     name = "ilbc-rfc3951.tar.gz";
     src = msilbc.src;
-	outputHashAlgo = "sha256";
+    outputHashAlgo = "sha256";
     outputHash = "0f6scsp72bz2ifscd8c0x57ipcxi2i4a9b4nwlnwx7a7a0hrazhj";
     phases = "unpackPhase installPhase";
     installPhase = "cp ilbc-rfc3951.tar.gz \${out}";
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index f289dd8ee0f..c038adf632f 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,10 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng, bzip2 }:
 
 stdenv.mkDerivation {
   name = "imlib2-1.3.0";
+  
   src = fetchurl {
     url = mirror://sourceforge/enlightenment/imlib2-1.3.0.tar.gz;
     sha256 = "1lrg7haqhmzpdb14cgp9vny5fanlwlyhf5n017v130in297gv1qj";
   };
-  buildInputs = [x11 libjpeg libtiff libungif libpng bzip2];
+  
+  buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ];
 }
diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index 4c7cbb4e691..0dbab1a7ac4 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, cfitsio, libusb, zlib }:
+
 stdenv.mkDerivation {
   name = "indilib-0.5";
 
@@ -7,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "02km37m3d2l8c9wnab24zm2k6a3l8h2fali74jhm4z3khwr277ad";
   };
 
-  propagatedBuildInputs = [cfitsio libusb zlib];
+  propagatedBuildInputs = [ cfitsio libusb zlib ];
 
   meta = {
     homepage = http://indi.sf.net;
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index 46fe5b6ef03..9b45dbb91ec 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -1,34 +1,35 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec{
-	name = "iniparser-3.0b";
+  name = "iniparser-3.0b";
 
-	src = fetchurl {
-		url = "${meta.homepage}/iniparser3.0b.tar.gz";
-		sha256 = "09klyddnqlpbgkv4cmh6ww9q5pv6nf1vfmzw4z256p51rnnlqqwa";
-	};
+  src = fetchurl {
+    url = "${meta.homepage}/iniparser3.0b.tar.gz";
+    sha256 = "09klyddnqlpbgkv4cmh6ww9q5pv6nf1vfmzw4z256p51rnnlqqwa";
+  };
 
-	patches = ./no-usr.patch;
+  patches = ./no-usr.patch;
 
-	buildFlags = "libiniparser.so";
+  buildFlags = "libiniparser.so";
 
-	installPhase = ''
-	ensureDir $out/lib
-	cp libiniparser.so.0 $out/lib
-	ln -s libiniparser.so.0 $out/lib/libiniparser.so
+  installPhase = ''
+    ensureDir $out/lib
+    cp libiniparser.so.0 $out/lib
+    ln -s libiniparser.so.0 $out/lib/libiniparser.so
 
-	ensureDir $out/include
-	cp src/*.h $out/include
+    ensureDir $out/include
+    cp src/*.h $out/include
 
-	ensureDir $out/share/doc/${name}
-	for i in AUTHORS INSTALL LICENSE README; do
-		bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
-	done;
-	cp -r html $out/share/doc/${name}
-	'';
+    ensureDir $out/share/doc/${name}
+    for i in AUTHORS INSTALL LICENSE README; do
+      bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
+    done;
+    cp -r html $out/share/doc/${name}
+  '';
 
-	meta = {
-		homepage = http://ndevilla.free.fr/iniparser;
-		description = "Free standalone ini file parsing library";
-		license = "MIT";
-	};
+  meta = {
+    homepage = http://ndevilla.free.fr/iniparser;
+    description = "Free standalone ini file parsing library";
+    license = "MIT";
+  };
 }
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 6cdd1016690..27890bd01e8 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,16 +1,18 @@
-{stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl} :
+{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl }:
 
 stdenv.mkDerivation rec {
-  name = "heimdal-1.3.2";
+  name = "heimdal-1.3.3";
 
   src = fetchurl {
     urls = [
       "http://www.h5l.org/dist/src/${name}.tar.gz"
       "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
     ];
-    sha256 = "0qwcq79nffsv9iyz4cf854l85i3x1cq79rxb34prpmjbfvs3ynwn";
+    sha256 = "0c465by1g7niy3nkfs5mwrm6j6w2cvrf4988h3lpmj194lkjp3cc";
   };
 
+  patches = [ ./no-md2.patch ];
+  
   ## ugly, X should be made an option
   configureFlags = "--with-openldap=${openldap} --without-x";
   
diff --git a/pkgs/development/libraries/kerberos/no-md2.patch b/pkgs/development/libraries/kerberos/no-md2.patch
new file mode 100644
index 00000000000..c13671c988e
--- /dev/null
+++ b/pkgs/development/libraries/kerberos/no-md2.patch
@@ -0,0 +1,46 @@
+http://old.nabble.com/-patch--fix-build-with-openssl-1.0-td28388913.html
+
+diff -Naur -x '*~' heimdal-1.3.2/include/crypto-headers.h heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h
+--- heimdal-1.3.2/include/crypto-headers.h 2010-03-22 05:11:24.000000000 +0100
++++ heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h 2010-04-28 14:54:53.000000000 +0200
+@@ -13,7 +13,9 @@
+ #include <openssl/des.h>
+ #include <openssl/rc4.h>
+ #include <openssl/rc2.h>
++#ifdef HAVE_OPENSSL_MD2_H
+ #include <openssl/md2.h>
++#endif
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+ #include <openssl/sha.h>
+diff -Naur -x '*~' heimdal-1.3.2/lib/hx509/crypto.c heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c
+--- heimdal-1.3.2/lib/hx509/crypto.c 2010-03-22 05:11:24.000000000 +0100
++++ heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c 2010-04-28 15:12:20.000000000 +0200
+@@ -1354,6 +1354,7 @@
+     NULL
+ };
+ 
++#ifdef HAVE_OPENSSL_MD2_H
+ static const struct signature_alg md2_alg = {
+     "rsa-md2",
+     &asn1_oid_id_rsa_digest_md2,
+@@ -1366,6 +1367,7 @@
+     evp_md_verify_signature,
+     NULL
+ };
++#endif
+ 
+ /*
+  * Order matter in this structure, "best" first for each "key
+@@ -1387,7 +1389,9 @@
+     &sha256_alg,
+     &sha1_alg,
+     &md5_alg,
++#ifdef HAVE_OPENSSL_MD2_H
+     &md2_alg,
++#endif
+     NULL
+ };
+ 
+
+
diff --git a/pkgs/development/libraries/lesstif-0.93/default.nix b/pkgs/development/libraries/lesstif-0.93/default.nix
index 3e452cf81c4..e8ec3d5e659 100644
--- a/pkgs/development/libraries/lesstif-0.93/default.nix
+++ b/pkgs/development/libraries/lesstif-0.93/default.nix
@@ -1,23 +1,25 @@
-args: with args ;
-
+{ stdenv, fetchurl, x11, libXp, libXau }:
 
 stdenv.mkDerivation {
   name = "lesstif-0.93.94";
+  
   src = fetchurl {
     url = http://prdownloads.sourceforge.net/lesstif/lesstif-0.93.94.tar.bz2;
     sha256 = "0v4l46ill6dhhswsw1hk6rqyng98d85nsr214vhd2k0mfajpig1y";
   };
+  
   buildInputs = [x11];
+  
   propagatedBuildInputs = [libXp libXau];
 
   # This is an older release of lesstif which works with arb.
-  #
-  patches = [
-    ./c-bad_integer_cast.patch    
-    ./c-xim_chained_list_crash.patch
-    ./c-render_table_crash.patch 
-    ./stdint.patch
+  patches =
+    [ ./c-bad_integer_cast.patch    
+      ./c-xim_chained_list_crash.patch
+      ./c-render_table_crash.patch 
+      ./stdint.patch
     ];
+    
   meta = {
     priority = "5";
   };
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 672ca202354..07753c86403 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libraw1394 }:
+
 stdenv.mkDerivation {
   name = "libavc1394-0.5.3";
 
@@ -7,12 +8,12 @@ stdenv.mkDerivation {
     sha256 = "19i40i3722ilhziknfds3a6w5xzv66fvc68gvbir1p2fvwi6ij93";
   };
 
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [libraw1394];
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ libraw1394 ];
 
   meta = { 
-      description = "programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
-      homepage = http://sourceforge.net/projects/libavc1394/;
-      license = [ "GPL" "LGPL" ];
+    description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
+    homepage = http://sourceforge.net/projects/libavc1394/;
+    license = [ "GPL" "LGPL" ];
   };
 }
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
new file mode 100644
index 00000000000..528560d1e02
--- /dev/null
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -0,0 +1,35 @@
+{ fetchurl, stdenv, pkgconfig, glib, gtk, cairo, clutter, sqlite
+, clutter_gtk, libsoup /*, libmenphis */ }:
+
+stdenv.mkDerivation rec {
+  name = "libchamplain-0.6.1";
+
+  src = fetchurl {
+    url = "http://download.gnome.org/sources/libchamplain/0.6/${name}.tar.gz";
+    sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  # These all appear in `champlain{,-gtk}-0.6.pc'.
+  propagatedBuildInputs =
+    [ glib gtk cairo clutter clutter_gtk sqlite libsoup ];
+
+  meta = {
+    homepage = http://projects.gnome.org/libchamplain/;
+    license = "LGPLv2+";
+
+    description = "libchamplain, a C library providing a ClutterActor to display maps";
+
+    longDescription =
+      '' libchamplain is a C library providing a ClutterActor to display
+         maps.  It also provides a Gtk+ widget to display maps in Gtk+
+         applications.  Python and Perl bindings are also available.  It
+         supports numerous free map sources such as OpenStreetMap,
+         OpenCycleMap, OpenAerialMap, and Maps for free.
+      '';
+
+     maintainers = [ stdenv.lib.maintainers.ludo ];
+     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index 6dc2783721a..3dee7ca6e32 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -1,10 +1,23 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "libdaemon-0.12";
+stdenv.mkDerivation rec {
+  name = "libdaemon-0.14";
+
   src = fetchurl {
-    url = http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.12.tar.gz;
-    sha256 = "1l1nhgc3m67bhpyyvrr48wz06h40ck6abhbns08g66jdckwckrrr";
+    url = "${meta.homepage}/${name}.tar.gz";
+    sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx";
+  };
+
+  configureFlags = [ "--disable-lynx" ];
+
+  meta = {
+    description = "libdaemon, a lightweight C library that eases the writing of UNIX daemons";
+
+    homepage = http://0pointer.de/lennart/projects/libdaemon/;
+
+    license = "LGPLv2+";
+
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
-  configureFlags = "--disable-lynx";
 }
diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
deleted file mode 100644
index bb146a5cddf..00000000000
--- a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-			fetchurl {
-				url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz;
-				sha256 = "1bflwl1k3rf1h8clx3zv5pxnm5hbhq6izikv0phkss3qxkjm61ap";
-			};
-
-		buildInputs = [libdbi]  
-		++(if args ? mysql then [args.mysql] else [])
-		++(if args ? sqlite then [args.sqlite] else [])
-		;
-		configureFlags = [
-			" --enable-libdbi "
-			" --with-dbi-incdir=${libdbi}/include " 
-			" --with-dbi-libdir=${libdbi}/lib " 
-		]
-		++ (if args ? mysql then [
-			" --with-mysql "
-			" --with-mysql-incdir=${args.mysql}/include/mysql " 
-			" --with-mysql-libdir=${args.mysql}/lib/mysql " 
-		] else [])
-		++ (if args ? sqlite then [
-			" --with-sqlite "
-			" --with-sqlite-incdir=${args.sqlite}/include/sqlite " 
-			" --with-sqlite-libdir=${args.sqlite}/lib/sqlite " 
-		] else [])
-		;
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "libdbi-0.8.2-1";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "DB independent interface to DB; DB drivers (mysql only for now)";
-		inherit src;
-	};
-}
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
new file mode 100644
index 00000000000..6f61d9b3cad
--- /dev/null
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, libdbi, mysql ? null, sqlite ? null }:
+
+stdenv.mkDerivation rec {
+  name = "libdbi-drivers-0.8.3-1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libdbi-drivers/${name}.tar.gz";
+    sha256 = "0wng59xnq8jjyp6f3bfjrhjvqrswamrjykdnxq6rqxnfk11r9faa";
+  };
+
+  buildInputs = [ libdbi mysql sqlite ];
+
+  configureFlags =
+    [ "--disable-docs"
+      "--enable-libdbi"
+      "--with-dbi-incdir=${libdbi}/include"
+      "--with-dbi-libdir=${libdbi}/lib"
+    ] ++ stdenv.lib.optionals (mysql != null)
+    [ "--with-mysql"
+      "--with-mysql-incdir=${mysql}/include/mysql"
+      "--with-mysql-libdir=${mysql}/lib/mysql"
+    ] ++ stdenv.lib.optionals (sqlite != null)
+    [ "--with-sqlite3"
+      "--with-sqlite3-incdir=${sqlite}/include/sqlite"
+      "--with-sqlite3-libdir=${sqlite}/lib/sqlite"
+    ];
+    
+  meta = {
+    description = "Database drivers for libdbi";
+  };
+}
diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix
deleted file mode 100644
index b908c76fa78..00000000000
--- a/pkgs/development/libraries/libdbi/0.8.2.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-			fetchurl {
-				url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz;
-				sha256 = "01zlfv9hd4iv9v1xlh64ajdgx95jb0sjpazavapqc0zwiagwcg4d";
-			};
-
-		buildInputs = [];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "libdbi-0.8.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "DB independent interface to DB";
-		inherit src;
-	};
-}
diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix
new file mode 100644
index 00000000000..11bb4965a4e
--- /dev/null
+++ b/pkgs/development/libraries/libdbi/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libdbi-0.8.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libdbi/${name}.tar.gz";
+    sha256 = "1qx5d5ikx65k73ir9rf557ri6j99ihsnjqqyznqsf7dvprb1ir3j";
+  };
+
+  configureFlags = "--disable-docs";
+
+  meta = {
+    description = "DB independent interface to DB";
+  };
+}
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
new file mode 100644
index 00000000000..1a9d6697438
--- /dev/null
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, qt4, cmake }:
+
+let
+  baseName = "libdbusmenu-qt";
+  v = "0.5.1";
+in
+stdenv.mkDerivation rec {
+  name = "${baseName}-${v}";
+
+  src = fetchurl {
+    url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
+    sha256 = "0ipz1f08d2wgg18l12wssv9lhm66xhj31a1dbikg2rzw7c6bvjvk";
+  };
+
+  buildInputs = [ cmake qt4 ];
+  
+  meta = with stdenv.lib; {
+    description = "Provides a Qt implementation of the DBusMenu spec";
+    homepage = http://people.canonical.com/~agateau/dbusmenu/;
+    maintainers = [ maintainers.urkud ];
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 0b8593279d3..94fb7f96986 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig, libpthreadstubs}:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.18";
+  name = "libdrm-2.4.21";
   
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "015nxrb2wvyqlxvwaqq40v46nj96sk71p2n4dh4h5djwzx7v9ign";
+    sha256 = "0jx1idd2ycglx81b0nlawh07lgi8k5h9854c9apdxcdnlcmn26sf";
   };
 
   buildInputs = [ pkgconfig libpthreadstubs ];
diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index 69011a6ef97..3213c0634ba 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -1,6 +1,8 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, fetchurl }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
 
   flags = { }
     # TODO! implement flags
@@ -14,15 +16,13 @@ composableDerivation {} {
 
   name = "libdv-1.0.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
     sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
   };
 
   meta = {
-    description = "software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
+    description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
     homepage = http://sourceforge.net/projects/libdv/;
-    # you can choose one of the following licenses: 
-    license = [];
   };
 }
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 4402995d587..15ffe2fce02 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,10 +1,29 @@
 {stdenv, fetchurl}:
 
+let version = "1.4.14b"; in
 stdenv.mkDerivation {
-  name = "libevent-1.1b";
+  name = "libevent-${version}";
 
   src = fetchurl {
-    url = http://monkey.org/~provos/libevent-1.1b.tar.gz;
-    md5 = "ec8dac612aa43ed172f300f396fcec49";
+    url = "http://monkey.org/~provos/libevent-${version}-stable.tar.gz";
+    sha256 = "00b3wih3qpcik6v0qh1406abs2xb954d58ncqwzs8ar2d93ip9mg";
+  };
+
+  meta = {
+    description = "libevent, an event notification library";
+
+    longDescription =
+      '' The libevent API provides a mechanism to execute a callback function
+         when a specific event occurs on a file descriptor or after a timeout
+         has been reached.  Furthermore, libevent also support callbacks due
+         to signals or regular timeouts.
+
+         libevent is meant to replace the event loop found in event driven
+         network servers.  An application just needs to call event_dispatch()
+         and then add or remove events dynamically without having to change
+         the event loop.
+      '';
+
+    license = "mBSD";
   };
 }
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index 76434d2c30b..7c2c9129c26 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
   name = "libexif-0.6.16";
@@ -8,5 +8,5 @@ stdenv.mkDerivation rec {
     sha256 = "0hxc3aik3sn8xq4mbmxxb8ycx2lwffmhi5xvz0zjffhfwkaqas6v";
   };
 
-  buildInputs = [gettext];
+  buildInputs = [ gettext ];
 }
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix
index 16272ebeb2b..920f40abd5a 100644
--- a/pkgs/development/libraries/libgeotiff/default.nix
+++ b/pkgs/development/libraries/libgeotiff/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libtiff }:
+
 stdenv.mkDerivation {
   name = "libgeotiff-1.2.4";
 
@@ -7,10 +8,10 @@ stdenv.mkDerivation {
     sha256 = "0z2yx77pm0zs81hc0b4lwzdd5s0rxcbylnscgq80b649src1fyzj";
   };
 
-  buildInputs = [libtiff];
+  buildInputs = [ libtiff ];
 
   meta = {
-    description = "library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
+    description = "Library implementing attempt to create a tiff based interchange format for georeferenced raster imagery";
     homepage = http://www.remotesensing.org/geotiff/geotiff.html;
     license = "X11";
     maintainers = [stdenv.lib.maintainers.marcweber];
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index 51c06c0382b..ff22d1d032b 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, zlib, libpng }:
+
 stdenv.mkDerivation {
   name = "haru-2.1.0";
 
@@ -9,13 +10,13 @@ stdenv.mkDerivation {
 
   configureFlags = "--with-zlib=${zlib} --with-png=${libpng}";
 
-  buildInputs = [zlib libpng];
+  buildInputs = [ zlib libpng ];
 
   meta = { 
     description = "cross platform, open source library for generating PDF files";
     homepage = http://libharu.org/wiki/Main_Page;
     license = "ZLIB/LIBPNG"; # see README.
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
index a2590a7de3f..d1337604260 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libraw1394 }:
+
 stdenv.mkDerivation rec {
   version = "1.2.0";
   name = "libiec61883-${version}";
@@ -9,12 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "7c7879c6b9add3148baea697dfbfdcefffbc8ac74e8e6bcf46125ec1d21b373a";
   };
 
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [libraw1394];
+  buildInputs = [ pkgconfig ];
+  
+  propagatedBuildInputs = [ libraw1394 ];
 
   meta = { 
-      description = "TODO";
-      homepage = http://www.linux1394.org;
-      license = "LGPL";
-    };
+    homepage = http://www.linux1394.org;
+    license = "LGPL";
+  };
 }
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
new file mode 100644
index 00000000000..83707b2477e
--- /dev/null
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -0,0 +1,43 @@
+{ gtkWidgets ? false # build GTK widgets for libinfinity
+, daemon ? false # build infinote daemon
+, documentation ? false # build documentation
+, avahiSupport ? false # build support for Avahi in libinfinity
+, stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl
+, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null }:
+
+let
+  edf = flag: feature: (if flag then "--with-" else "--without-") + feature;
+  optional = cond: elem: assert cond -> elem != null; if cond then [elem] else [];
+
+in stdenv.mkDerivation rec {
+
+  name = "libinfinity-0.4.1";
+  src = fetchurl {
+    url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
+    sha256 = "1vdyj6xvwkisrc222i84mq93gasywad4i0ismafdjq2wapxn30r6";
+  };
+
+  buildInputs = [ pkgconfig glib libxml2 gnutls gsasl ]
+    ++ optional gtkWidgets gtk
+    ++ optional documentation gtkdoc
+    ++ optional avahiSupport avahi
+    ++ optional daemon libdaemon;
+  
+  configureFlags = ''
+    ${if documentation then "--enable-gtk-doc" else "--disable-gtk-doc"}
+    ${edf gtkWidgets "inftextgtk"}
+    ${edf gtkWidgets "infgtk"}
+    ${edf daemon "infinoted"}
+    ${edf daemon "libdaemon"}
+    ${edf avahiSupport "avahi"}
+  '';
+
+  meta = {
+    homepage = http://gobby.0x539.de/;
+    description = "An implementation of the Infinote protocol written in GObject-based C";
+    license = "LGPLv2+";
+    maintainers = [ stdenv.lib.maintainers.phreedom ];
+  };
+
+}
+
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
new file mode 100644
index 00000000000..e2904560e37
--- /dev/null
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, nasm }: 
+
+stdenv.mkDerivation {
+  name = "libjpeg-turbo-1.0.0";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.0.0.tar.gz;
+    sha256 = "17zvyckjbscrr9b8i43g6g0960q5ammf4r93hkkx7s4hzjxvmkfj";
+  };
+
+  buildInputs = [ nasm ];
+  
+  meta = {
+    homepage = http://libjpeg-turbo.virtualgl.org/;
+    description = "A faster (using SIMD) libjpeg implementation";
+    license = "free";
+  };
+}
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index bc3245cf76d..d31bc260509 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "libjpeg-8";
   
   src = fetchurl {
-    url = http://www.ijg.org/files/jpegsrc.v8.tar.gz;
-    sha256 = "1b0blpk8v397klssk99l6ddsb64krcb29pbkbp8ziw5kmjvsbfhp";
+    url = http://www.ijg.org/files/jpegsrc.v8b.tar.gz;
+    sha256 = "19vl6587pyhz45f14yipnsnpni4iz6j0wdzwyblbm4f5vs721rin";
   };
   
   meta = {
diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index eb574fbc8c8..c65c62eaca7 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, zlib, libpng, libjpeg, lcms, automake, autoconf, libtool }:
+
 stdenv.mkDerivation {
   name = "libmng-1.0.10";
 
@@ -7,18 +8,15 @@ stdenv.mkDerivation {
     sha256 = "06415s40gz833s1v1q7c04c0m49p4sc87ich0vpdid2ldj0pf53v";
   };
 
-  preConfigure = "
-    unmaintained/autogen.sh
-    #cp makefiles/makefile.linux Makefile
-  ";
+  preConfigure = "unmaintained/autogen.sh";
 
-  buildInputs = [zlib libpng libjpeg lcms automake autoconf libtool];
+  buildInputs = [ zlib libpng libjpeg lcms automake autoconf libtool ];
 
   meta = { 
-    description = "THE reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
+    description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
     homepage = http://sourceforge.net/projects/libmng;
     license = "zlib/libpng";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libmsn/default.nix b/pkgs/development/libraries/libmsn/default.nix
index 77f8b572778..3d7f20291b9 100644
--- a/pkgs/development/libraries/libmsn/default.nix
+++ b/pkgs/development/libraries/libmsn/default.nix
@@ -6,5 +6,7 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/libmsn/${name}.tar.bz2";
     sha256 = "0p3c3gidnq4ai697dgg930hm7aap4176sbq7w7nn0mxg4rg5gwfx";
   };
+  patches = [ ./libmsn-4.1-openssl-1.patch ];
+  patchFlags = "-p0";
   buildInputs = [ cmake openssl ];
 }
diff --git a/pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch b/pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch
new file mode 100644
index 00000000000..cdaecf7dc54
--- /dev/null
+++ b/pkgs/development/libraries/libmsn/libmsn-4.1-openssl-1.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/328031
+
+--- msntest/msntest.cpp
++++ msntest/msntest.cpp
+@@ -259,7 +259,11 @@
+                     if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected)
+                     {
+                         BIO *bio_socket_new;
+-                        SSL_METHOD *meth=NULL;
++                        #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++                        const SSL_METHOD *meth=NULL;
++                        #else
++                        SSL_METHOD *meth=NULL;
++                        #endif
+                         meth=SSLv23_client_method();
+                         SSLeay_add_ssl_algorithms();
+                         mySocketsSsl[i].ctx = SSL_CTX_new(meth);
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index 5683aa560b1..3ea201a7e50 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, dbus, expat }:
 
-let version = "1.0.1"; in
+let version = "1.0.2"; in
 
 stdenv.mkDerivation rec {
   name = "libnih-${version}";
   
   src = fetchurl {
     url = "http://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
-    sha256 = "1sjkhpryk9vrv84bbab7b47spq60rkycm10ygnjfybjypk6hs7ds";
+    sha256 = "0zi5qacppsipc03gqdr0vpgfqk17kxxxnrqzb6md12kixfahl33v";
   };
 
   buildInputs = [ pkgconfig dbus expat ];
diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix
index e2d1c25d013..e24a93c1043 100644
--- a/pkgs/development/libraries/libnova/default.nix
+++ b/pkgs/development/libraries/libnova/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libnova-0.12.1";
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index aadc5f653fc..35d41cc3776 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -1,9 +1,14 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "libogg-1.1.4";
+stdenv.mkDerivation rec {
+  name = "libogg-1.2.0";
+  
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/ogg/libogg-1.1.4.tar.gz;
-    sha256 = "00z15ha73yfv7zn9z2z5yvc8g53ci6vn12vpc0l7qhc8zn1w2m4k";
+    url = "http://downloads.xiph.org/releases/ogg/${name}.tar.gz";
+    sha256 = "0sgbb7n8zwmycj2iid3h0hrxqg7ql9z34lg51bl99kca4cz9h3gk";
+  };
+
+  meta = {
+    homepage = http://xiph.org/ogg/;
   };
 }
diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix
index 1e253ad7842..05cafecff27 100644
--- a/pkgs/development/libraries/liboil/default.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, ...}:
+{stdenv, fetchurl, pkgconfig, glib }:
 
 stdenv.mkDerivation rec {
   name = "liboil-0.3.15";
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 746266b92c7..bfd0a6b98b1 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,23 +1,22 @@
-{stdenv, fetchurl, zlib}:
+{ stdenv, fetchurl, zlib }:
 
 assert zlib != null;
 
 stdenv.mkDerivation rec {
-  name = "libpng-1.2.42";
+  name = "libpng-1.2.44";
   
   src = fetchurl {
     url = "mirror://sourceforge/libpng/${name}.tar.gz";
-    md5 = "562066eb8557db91156eaeb309458488";
+    md5 = "89b62f8daaeeab1342e307d6d1411ff1";
   };
   
-  propagatedBuildInputs = [zlib];
-  
-  inherit zlib;
+  propagatedBuildInputs = [ zlib ];
 
+  passthru = { inherit zlib; };
+  
   meta = {
     description = "The official reference implementation for the PNG file format";
     homepage = http://www.libpng.org/pub/png/libpng.html;
     license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
   };
 }
-
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index 2ca8c543fa9..a910d11f410 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
   name = "libraw1394-1.3.0";
 
@@ -8,8 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   meta = { 
-      description = "library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
-      homepage = "http://www.linux1394.org";
-      license = ["GPL" "LGPL"];
+    description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
+    homepage = http://www.linux1394.org;
+    license = ["GPL" "LGPL"];
   };
 }
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index 05ffb27bc0a..e02cedeeab3 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, librdf_raptor, ladspaH, openssl, zlib }:
+
 stdenv.mkDerivation {
   name = "liblrdf-0.4.0";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm";
   };
 
-  buildInputs = [pkgconfig librdf_raptor ladspaH openssl zlib];
+  buildInputs = [ pkgconfig librdf_raptor ladspaH openssl zlib ];
 
   meta = { 
     description = "A lightweight RDF library with special support for LADSPA plugins.";
     homepage = http://sourceforge.net/projects/lrdf/;
     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/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix
index 294e51c6654..738369e796a 100644
--- a/pkgs/development/libraries/librdf/raptor.nix
+++ b/pkgs/development/libraries/librdf/raptor.nix
@@ -1,21 +1,20 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "raptor-1.4.19";
+{ stdenv, fetchurl, libxml2, curl }:
+
+stdenv.mkDerivation rec {
+  name = "raptor-1.4.21";
 
   src = fetchurl {
-    url = http://download.librdf.org/source/raptor-1.4.19.tar.gz;
-    sha256 = "0qpfl73dvkhngica7wk9qglvd0b3fp9wqnjkl5q8m6h1kf8605ml";
+    url = "http://download.librdf.org/source/${name}.tar.gz";
+    sha256 = "db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca";
   };
 
-  buildInputs = [
-    #optional
-    libxml2 curl];
+  buildInputs = [ libxml2 curl ];
 
   meta = { 
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
     license = "LGPL-2.1 Apache-2.0";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index ff3bcbfbd16..681453985b9 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -1,24 +1,24 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "rasqal-0.9.16";
+{ stdenv, fetchurl, librdf_raptor, gmp, pkgconfig, pcre, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "rasqal-0.9.19";
 
   src = fetchurl {
-    url = http://download.librdf.org/source/rasqal-0.9.16.tar.gz;
-    sha256 = "1qvxbkynxwfw22hn2qbgxczzaq24h9649bcfbc598x9gq5m7hsq6";
+    url = "http://download.librdf.org/source/${name}.tar.gz";
+    sha256 = "a042846e8b7af52d9d66fba788c9d579e58c535cfaf80d33dc0bd69bf6ffeb08";
   };
 
-  buildInputs = [
-    librdf_raptor
-    gmp /*or mpfr*/
-    #optional
-    pcre libxml2 
-    ];
+  buildInputs = [ librdf_raptor gmp /*or mpfr*/ pkgconfig pcre libxml2 ];
+
+  preConfigure = ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lraptor"
+  '';
 
   meta = { 
-    description = "library that handles Resource Description Framework (RDF)";
+    description = "Library that handles Resource Description Framework (RDF)";
     homepage = "http://librdf.org/rasqal";
     license = "LGPL-2.1 Apache-2.0";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index a30a2884c6a..8c132407d06 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,24 +1,20 @@
-args: with args;
-stdenv.mkDerivation {
+{ stdenv, fetchurl, pkgconfig, fftw, libsndfile }:
 
-  name = "libsamplerate-0.1.2";
+stdenv.mkDerivation rec {
+  name = "libsamplerate-0.1.7";
 
-  src = args.fetchurl {
-    url = http://www.mega-nerd.com/SRC/libsamplerate-0.1.2.tar.gz;
+  src = fetchurl {
+    url = "http://www.mega-nerd.com/SRC/${name}.tar.gz";
     sha256 = "1m1iwzpcny42kcqv5as2nyb0ggrb56wzckpximqpp2y74dipdf4q";
   };
 
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ fftw libsndfile ];
 
-  buildInputs = ["pkgconfig"];
   # maybe interesting configure flags:
   #--disable-fftw          disable usage of FFTW
   #--disable-cpu-clip      disable tricky cpu specific clipper
 
-  configurePhase = "
-   export LIBSAMPLERATE_CFLAGS=\"-I \$libsamplerate/include\"
-   export LIBSAMPLERATE_LIBS=\"-L \$libsamplerate/libs\"
-   ./configure --prefix=\$out";
-
   meta = {
     description = "Sample Rate Converter for audio";
     homepage = http://www.mega-nerd.com/SRC/index.html;
diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix
index 9dd50c37c61..ba11e0752b2 100644
--- a/pkgs/development/libraries/libsigsegv/2.5.nix
+++ b/pkgs/development/libraries/libsigsegv/2.5.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "libsigsegv-2.5";
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index e2a25583326..d170c2fd231 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,14 +1,17 @@
 { stdenv, fetchurl, zlib, libjpeg }:
 
 stdenv.mkDerivation {
-  name = "libtiff-3.9.1";
+  name = "libtiff-3.9.4";
   
   src = fetchurl {
-    url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.1.tar.gz;
-    sha256 = "168yssav47xih2y17m7psj4k6ngnfai300bbfznc75hn3crxfdil";
+    urls =
+      [ ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.4.tar.gz
+        http://download.osgeo.org/libtiff/tiff-3.9.4.tar.gz
+      ];
+    sha256 = "19hxd773yxcs4lxlc3zfdkz5aiv705vj2jvy5srpqkxpbw3nvdv7";
   };
   
-  propagatedBuildInputs = [zlib libjpeg];
+  propagatedBuildInputs = [ zlib libjpeg ];
 
   meta = {
     description = "Library and utilities for working with the TIFF image file format";
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 9480a7ad700..a2e3e4db647 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,11 +1,16 @@
-{stdenv, fetchurl, libogg}:
+{ stdenv, fetchurl, libogg }:
 
-stdenv.mkDerivation {
-  name = "libvorbis-1.2.3";
+stdenv.mkDerivation rec {
+  name = "libvorbis-1.3.1";
+  
   src = fetchurl {
-    url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.3.tar.bz2;
-    sha256 = "0aj9jfxsp89vs78321sqvj8my4bxcb7pjr959nhi9wj0r032gyfv";
+    url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.bz2";
+    sha256 = "1q6gah9g6w5gxjq95x1x81a4w76p3caivq1bw4hxs0z9rx05qj22";
   };
 
   propagatedBuildInputs = [ libogg ];
+
+  meta = {
+    homepage = http://xiph.org/vorbis/;
+  };
 }
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 43c29524d58..7cd2e4d639b 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, bash}:
+{stdenv, fetchurl, bash, yasm}:
 
 stdenv.mkDerivation rec {
-  name = "libvpx-0.9.0";
+  name = "libvpx-0.9.1";
   
   src = fetchurl {
-    url = http://webm.googlecode.com/files/libvpx-0.9.0.tar.bz2;
-    sha256 = "1p5rl7r8zpw43n8i38wv73na8crkkakw16yx0v7n3ywwhp36l2d0";
+    url = http://webm.googlecode.com/files/libvpx-0.9.1.tar.bz2;
+    sha256 = "0ngc8y12np2q6yhrrn6cbmlbzwbk10fnldj8d5dxxzvrw1iy9s64";
   };
 
   patchPhase = ''
@@ -16,13 +16,15 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     mkdir -p build
     cd build
-    ../configure --disable-install-srcs --disable-examples --enable-vp8 --enable-runtime-cpu-detect
+    ../configure --disable-install-srcs --disable-examples --enable-vp8 --enable-runtime-cpu-detect --enable-shared --enable-pic
   '';
 
   installPhase = ''
     make quiet=false DIST_DIR=$out install
   '';
 
+  buildInputs = [ yasm ];
+
   meta = {
     description = "VP8 video encoder";
     homepage = http://code.google.com/p/webm;
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index 7f7d7693182..95740882a93 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, zlib, imagemagick, libpng, pkgconfig, glib, freetype
+, libjpeg, libxml2 }:
 
 stdenv.mkDerivation {
   name = "libwmf-0.2.8.4";
@@ -8,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v";
   };
 
-  buildInputs = [zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2];
+  buildInputs = [ zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2 ];
 
   meta = {
     description = "WMF library from wvWare";
diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index ade3626918c..78487a9f323 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,9 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+
 stdenv.mkDerivation {
   name = "libwpd-0.8.14";
+  
   src = fetchurl {
     url = mirror://sourceforge/libwpd/libwpd-0.8.14.tar.gz;
     sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
   };
-  buildInputs = [pkgconfig glib libgsf libxml2 bzip2];
+  
+  buildInputs = [ pkgconfig glib libgsf libxml2 bzip2 ];
 }
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index e36df1da7b6..e8c3775a94b 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2
+, libICE, glib, libxkbfile, isocodes }:
 
 stdenv.mkDerivation rec {
   name = "libxklavier-4.0";
@@ -8,10 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71";
   };
 
-# TODO: enable xmodmap support, needs xmodmap DB
-  propagatedBuildInputs = [libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes];
+  # TODO: enable xmodmap support, needs xmodmap DB
+  propagatedBuildInputs = [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
   
-  buildInputs = [pkgconfig];
+  buildInputs = [ pkgconfig ];
   
   configureFlags = ''
     --with-xkb-base=${xkeyboard_config}/etc/X11/xkb
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index f3c9c6ca652..fe3b6bd6487 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
+{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
 
 assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
-  name = "libxml2-2.7.6";
+  name = "libxml2-2.7.7";
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.6.tar.gz;
-    sha256 = "0n61rqqfiv0m64p01cwx205i6hb0mmzf7r0ya40s4fiqd2nhkkg0";
+    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.7.tar.gz;
+    sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs";
   };
 
   configureFlags = ''                                                  
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
new file mode 100644
index 00000000000..7066bc6f9d5
--- /dev/null
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl
+, pkgconfig, libxml2, glibmm, perl }:
+stdenv.mkDerivation rec {
+  name = "libxml++-2.30.0";
+  src = fetchurl {
+    url = "mirror://gnome/sources/libxml++/2.30/${name}.tar.bz2";
+    sha256 = "1hgpw9lld0k6z34kxrapz8dxf3cbgnnhkx6himnvw9ax3qf7p5gk";
+  };
+
+  buildInputs = [ pkgconfig libxml2 glibmm perl ];
+
+  configureFlags = "--disable-documentation"; #doesn't build without this for some reason
+
+  meta = {
+    homepage = http://libxmlplusplus.sourceforge.net/;
+    description = "C++ wrapper for the libxml2 XML parser library";
+    license = "LGPLv2+";
+    maintainers = [ stdenv.lib.maintainers.phreedom ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 84732891cd1..46dc1435bcd 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libxml2, ...}:
+{stdenv, fetchurl, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "libxslt-1.1.26";
diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix
index 857197ea0c1..1754539a5f1 100644
--- a/pkgs/development/libraries/libzrtpcpp/default.nix
+++ b/pkgs/development/libraries/libzrtpcpp/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, commoncpp2, openssl, pkgconfig, ccrtp }:
 
 stdenv.mkDerivation rec {
   name = "libzrtpcpp-1.4.1";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0gj5xiv15xnxdbppa06fy02j8jg0zm1capva4nhbpgzg08n7p8y0";
   };
 
-  buildInputs = [commoncpp2 openssl pkgconfig ccrtp];
+  buildInputs = [ commoncpp2 openssl pkgconfig ccrtp ];
 
   meta = { 
     description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";
     homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP";
     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/development/libraries/mediastreamer/2.2.0-cvs20080207.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 2b4a6a35f83..2b4a6a35f83 100644
--- a/pkgs/development/libraries/mediastreamer/2.2.0-cvs20080207.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 23c12825f8e..d878135923d 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -5,15 +5,16 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then
 else
 
 stdenv.mkDerivation {
-  name = "mesa-7.6.1";
+  name = "mesa-7.8.2";
 
   src = fetchurl {
-    url = ftp://ftp.freedesktop.org/pub/mesa/7.6.1/MesaLib-7.6.1.tar.bz2;
-    md5 = "7db4617e9e10ad3aca1b64339fd71b7d";
+    url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2;
+    md5 = "6be2d343a0089bfd395ce02aaf8adb57";
   };
 
-  configureFlags = "--disable-gallium"
-                 + (if stdenv.isDarwin then " --disable-egl" else "");
+  configureFlags =
+    "--disable-gallium"
+    + (if stdenv.isDarwin then " --disable-egl" else "");
 
   buildInputs =
     [ pkgconfig expat x11 libdrm xlibs.glproto
diff --git a/pkgs/development/libraries/openalSoft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index f0bce75e07a..59851eda25a 100644
--- a/pkgs/development/libraries/openalSoft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, cmake, alsaLib }:
+
 stdenv.mkDerivation {
 #The current release is still in a testing phase, though it should be stable
 # (neither the ABI or API will break). Please try it out and let me know how it
@@ -11,11 +12,11 @@ stdenv.mkDerivation {
     sha256 = "162nyv4jy6qzi7s5q3wpdawfph6npyn1n4wjf21haxdxq0mmp6l7";
   };
 
-  buildInputs = [cmake alsaLib];
+  buildInputs = [ cmake alsaLib ];
   
   meta = {
-      description = "openal alternative";
-      homepage = http://kcat.strangesoft.net/openal.html;
-      license = "GPL2";
+    description = "OpenAL alternative";
+    homepage = http://kcat.strangesoft.net/openal.html;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 1a295f7da7d..1b64875d631 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -16,5 +16,7 @@ stdenv.mkDerivation rec {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = http://opencv.willowgarage.com/;
     license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index de4672ceb5e..386b92f2684 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,16 +1,18 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, zlib, ctl, ilmbase }:
 
-stdenv.mkDerivation {
-  inherit version;
-  name = "openexr-${version}";
+stdenv.mkDerivation rec {
+  name = "openexr-1.6.1";
+  
   src = fetchurl {
-    url = "http://download.savannah.nongnu.org/releases/openexr/openexr-${version}.tar.gz";
-    sha256 = if (version == "1.6.1") then "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6"
-             else if (version == "1.4.0") then "1y3dxakpg9651dgbj2xp6r4044b5gi74g23w3sr5cs6xi7cywv7m"
-               else abort "not supported version";
+    url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz";
+    sha256 = "0l2rdbx9lg4qk2ms98hwbsnzpggdrx3pbjl6pcvrrpjqp5m905n6";
   };
-  buildInputs = [pkgconfig zlib] ++ (lib.optional (args ? ctl) (args.ctl));
-  propagatedBuildInputs = [pkgconfig zlib ilmbase];
+  
+  buildInputs = [ pkgconfig ctl ];
+  
+  propagatedBuildInputs = [ zlib ilmbase ];
+  
   configureFlags = "--enable-imfexamples";
+  
   patches = [ ./stringh.patch ];
 }
diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix
index 288067a4bf2..1b15fdb6c9e 100644
--- a/pkgs/development/libraries/openexr_ctl/default.nix
+++ b/pkgs/development/libraries/openexr_ctl/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, openexr, ilmbase, ctl }:
+
 stdenv.mkDerivation {
   name = "openexr_ctl-1.0.1";
 
@@ -7,18 +8,14 @@ stdenv.mkDerivation {
     sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
   };
 
-  propagatedBuildInputs = [ilmbase];
-  buildInputs = [openexr ctl];
-  configureFlags="--with-ilmbase-prefix=${ilmbase}";
-  #configurePhase = "
-    #export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
-    #echo $CXXFLAGS
-    #unset configurePhase; configurePhase
-  #";
+  propagatedBuildInputs = [ ilmbase ];
+  
+  buildInputs = [ openexr ctl ];
+  
+  configureFlags = "--with-ilmbase-prefix=${ilmbase}";
 
   meta = {
-      description = "Color Transformation Language";
-      homepage = http://ampasctl.sourceforge.net;
-      license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
+    description = "Color Transformation Language";
+    homepage = http://ampasctl.sourceforge.net;
   };
 }
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 8c279ab5a3e..6de49846c2d 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,10 +1,11 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, gfortran}:
 
 stdenv.mkDerivation {
-  name = "openmpi-1.3.2";
+  name = "openmpi-1.4.2";
   src = fetchurl {
-    url = http://www.open-mpi.org/software/ompi/v1.3/downloads/openmpi-1.3.2.tar.gz ;
-    sha256 = "1n7c0y4nidm0ha23ic7f872qh3296rh2177r1wqqs83k2ma7xxxb";
+    url = http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.2.tar.bz2 ;
+    sha1 = "3e85092433d0e399cc7a51c018f9d13562f78b80";
   };
+  buildInputs = [ gfortran ];
 }
 
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 4e567cf6577..6dd579b98be 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -6,25 +6,30 @@ let
     stdenv.cross;
 in
 
-stdenv.mkDerivation ( rec {
-  name = "openssl-0.9.8n";
-  
+stdenv.mkDerivation rec {
+  name = "openssl-1.0.0a";
+
   src = fetchurl {
     url = "http://www.openssl.org/source/${name}.tar.gz";
-    sha256 = "008z1h09pa6dfxs4wgbqj5i1clw4v82b1waqvwanb1kb6wlbq6mh";
+    sha256 = "0qqgyzfb0alwx329z8bqybzamfl9j2maykykvq6zk3ibq0gvva8q";
   };
 
-  buildNativeInputs = [ perl ];
+  patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
 
-  configureScript = "./config";
+  buildNativeInputs = [ perl ];
+  
+  # On x86_64-darwin, "./config" misdetects the system as
+  # "darwin-i386-cc".  So specify the system type explicitly.
+  configureScript =
+    if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config";
   
-  configureFlags = "shared";
+  configureFlags = "shared --libdir=lib";
 
   crossAttrs = {
-    configurePhase = ''
+    preConfigure=''
       export cross=$crossSystem-
-      ./Configure --prefix=$out ${opensslCrossSystem} shared
     '';
+    configureFlags="--libdir=lib ${opensslCrossSystem} shared";
     buildPhase = ''
       make CC=$crossConfig-gcc \
         AR="$crossConfig-ar r" \
@@ -36,4 +41,4 @@ stdenv.mkDerivation ( rec {
     homepage = http://www.openssl.org/;
     description = "A cryptographic library that implements the SSL and TLS protocols";
   };
-} // (if stdenv.isDarwin then { patches = [./darwin-arch.patch]; } else {}) )
+}
diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix
new file mode 100644
index 00000000000..14d425b23a2
--- /dev/null
+++ b/pkgs/development/libraries/pango/1.28.x.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
+
+stdenv.mkDerivation rec {
+  name = "pango-1.28.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/pango/1.28/${name}.tar.bz2";
+    sha256 = "8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2";
+  };
+
+  buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext;
+
+  propagatedBuildInputs = [ x11 glib cairo libpng ];
+
+  meta = {
+    description = "A library for laying out and rendering of text, with an emphasis on internationalization";
+
+    longDescription = ''
+      Pango is a library for laying out and rendering of text, with an
+      emphasis on internationalization.  Pango can be used anywhere
+      that text layout is needed, though most of the work on Pango so
+      far has been done in the context of the GTK+ widget toolkit.
+      Pango forms the core of text and font handling for GTK+-2.x.
+    '';
+
+    homepage = http://www.pango.org/;
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix
index 067e8d50e22..87e06e9a57a 100644
--- a/pkgs/development/libraries/policykit/default.nix
+++ b/pkgs/development/libraries/policykit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, expat, pam
-, intltool, gettext, libxslt, docbook_xsl, ... }:
+, intltool, gettext, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
   name = "policykit-0.9";
diff --git a/pkgs/development/libraries/proj.4/default.nix b/pkgs/development/libraries/proj/default.nix
index ffb3bed5054..6e3cc7cac55 100644
--- a/pkgs/development/libraries/proj.4/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "proj-4.5.0";
 
@@ -8,8 +9,8 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-      description = "Cartographic Projections Library";
-      homepage = http://proj.maptools.org;
-      license = "MIT";
+    description = "Cartographic Projections Library";
+    homepage = http://proj.maptools.org;
+    license = "MIT";
   };
 }
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index 631a7622406..be219f1f288 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -1,14 +1,15 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation rec {
-	name = "pth-2.0.7";
-	
-	src = fetchurl {
-		url = "mirror://gnu/pth/${name}.tar.gz";
-		sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
-	};
+  name = "pth-2.0.7";
+  
+  src = fetchurl {
+    url = "mirror://gnu/pth/${name}.tar.gz";
+    sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
+  };
 
-	meta = {
-		description = "The GNU Portable Threads";
-		homepage = http://www.gnu.org/software/pth;
-	};
+  meta = {
+    description = "The GNU Portable Threads library";
+    homepage = http://www.gnu.org/software/pth;
+  };
 }
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
new file mode 100644
index 00000000000..a4b146ff424
--- /dev/null
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, cmake, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "qjson-0.7.1";
+
+  src = fetchurl {
+    url = "mirror://sf/qjson/${name}.tar.bz2";
+    sha256 = "155r7nypgnsvjc6w3q51zmjchpqxi4c3azad9cf1fip8bws993iv";
+  };
+
+  buildInputs = [ cmake qt4 ];
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (qt4.meta) platforms;
+  };
+}
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
new file mode 100644
index 00000000000..ee341617230
--- /dev/null
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -0,0 +1,19 @@
+{ stdenv
+, fetchurl
+, gfortran
+, blas
+, liblapack
+}:
+stdenv.mkDerivation {
+  name = "qrupdate-1.1.1";
+  src = fetchurl {
+    url = mirror://sourceforge/qrupdate/1.1/qrupdate-1.1.1.tar.gz ;
+    sha256 = "0ak68qd15zccr2d2qahxcxsrcdgxy7drg362jj9swv7rb39h00cz";  			
+  };
+  
+  preConfigure = ''
+    export PREFIX=$out
+  '';
+  
+  buildInputs = [gfortran blas liblapack] ;
+}
diff --git a/pkgs/development/libraries/qt-4.x/4.5/default.nix b/pkgs/development/libraries/qt-4.x/4.5/default.nix
index bee2c4e4679..3b29043aeeb 100644
--- a/pkgs/development/libraries/qt-4.x/4.5/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib
+{ stdenv, fetchurl
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
 , libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
 , zlib, libjpeg, mysql, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
@@ -80,6 +80,7 @@ stdenv.mkDerivation {
     homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp;
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/qt-4.x/4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix
index 914d629e5c0..3253e58e7c2 100644
--- a/pkgs/development/libraries/qt-4.x/4.6/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib
+{ stdenv, fetchurl
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
 , libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
 , zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
@@ -95,6 +95,7 @@ stdenv.mkDerivation rec {
     homepage = http://qt.nokia.com/products;
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
-    maintainers = with lib.maintainers; [ sander urkud ];
+    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index d02f9676652..3481eccf6d4 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -1,63 +1,69 @@
-{ stdenv, fetchurl, lib
+{ stdenv, fetchurl
 , alsaLib, gstreamer, gstPluginsBase, pulseaudio
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
 , libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
-, zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
+, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
 , mysql, postgresql, sqlite
 , perl, coreutils, libXi
 , buildDemos ? false, buildExamples ? false, useDocs ? true}:
 
+let
+  v = "4.7.0-beta2";
+in
+
 stdenv.mkDerivation rec {
-  name = "qt-4.7.0-beta1";
-  
+  name = "qt-${v}";
+
   src = fetchurl {
-    url = ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.0-beta1.tar.gz;
-    sha256 = "0ac9dk2xdcbwjmh9hgmnp60df9shv2ss78lls2apgnjddscdw1qi";
+    url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
+    sha256 = "1gxckb5pxybnj5413dxk7dm8hm945ymm4ppqwg14wfk83zhnw6g0";
   };
-  
-  preConfigure = '' 
+
+  preConfigure = ''
     export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
     configureFlags+="
       -docdir $out/share/doc/${name}
       -plugindir $out/lib/qt4/plugins
+      -importdir $out/lib/qt4/imports
       -examplesdir $out/share/doc/${name}/examples
       -demosdir $out/share/doc/${name}/demos
       -datadir $out/share/qt4
     "
   '';
-  
+
   propagatedBuildInputs = [
     alsaLib
     sqlite
-    libXft 
-    libXrender 
-    libXrandr 
+    libXft
+    libXrender
+    libXrandr
     libXi
-    randrproto 
+    randrproto
     xextproto
-    libXinerama 
-    xineramaproto 
-    libXcursor 
-    zlib 
-    libjpeg 
-    mysql 
+    libXinerama
+    xineramaproto
+    libXcursor
+    zlib
+    libjpeg
+    libmng
+    mysql
     postgresql
-    libpng 
-    which 
+    libpng
+    which
     mesa
-    libXmu 
+    libXmu
     libXv
-    openssl 
-    dbus.libs 
-    cups 
-    pkgconfig 
-    libXext 
-    freetype 
-    fontconfig 
+    openssl
+    dbus.libs
+    cups
+    pkgconfig
+    libXext
+    freetype
+    fontconfig
     inputproto
-    fixesproto 
-    libXfixes 
-    glib 
+    fixesproto
+    libXfixes
+    glib
     libtiff
     gstreamer
     gstPluginsBase
@@ -66,29 +72,25 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl ];
 
-  # 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 ";
 
   configureFlags = ''
     -v -no-separate-debug-info -release -fast -confirm-license -opensource
-    -system-zlib -system-libpng -system-libjpeg -qt-gif
+    -system-zlib -system-libpng -system-libjpeg -qt-gif -system-libmng
     -opengl -xrender -xrandr -xinerama -xcursor
     -plugin-sql-mysql -system-sqlite
-    -qdbus -cups -glib -xfixes -dbus-linked
+    -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
     -fontconfig -I${freetype}/include/freetype2
     -exceptions -xmlpatterns
-    -multimedia -mediaservices
-    -javascript-jit
+    -multimedia -audio-backend -phonon -phonon-backend
+    -webkit -javascript-jit
     ${if buildDemos == true then "-make demos" else "-nomake demos"}
     ${if buildExamples == true then "-make examples" else "-nomake examples"}
-    ${if useDocs then "-make docs" else "-nomake docs"}
-  '';
-    
-  patchPhase = ''
+    ${if useDocs then "-make docs" else "-nomake docs"}'';
+
+  patches = [ ./phonon-4.4.0.patch ];
+
+  postPatch = ''
     substituteInPlace configure --replace /bin/pwd pwd
     substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
     sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf
@@ -98,12 +100,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://qt.nokia.com/products;
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
-    maintainers = with lib.maintainers; [ urkud sander ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ urkud sander ];
+    platforms = platforms.mesaPlatforms;
     priority = 10;
   };
 }
diff --git a/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch b/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch
new file mode 100644
index 00000000000..50bdf5be1fa
--- /dev/null
+++ b/pkgs/development/libraries/qt-4.x/4.7/phonon-4.4.0.patch
@@ -0,0 +1,19 @@
+diff --git a/src/3rdparty/phonon/phonon/phononnamespace.h b/src/3rdparty/phonon/phonon/phononnamespace.h
+index ec42d51..eb899de 100644
+--- a/src/3rdparty/phonon/phonon/phononnamespace.h
++++ b/src/3rdparty/phonon/phonon/phononnamespace.h
+@@ -41,12 +41,12 @@
+ /**
+  * PHONON_VERSION is (major << 16) + (minor << 8) + patch.
+  */
+-#define PHONON_VERSION PHONON_VERSION_CHECK(4, 3, 1)
++#define PHONON_VERSION PHONON_VERSION_CHECK(4, 4, 0)
+ 
+ /**
+  * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1"
+  */
+-#define PHONON_VERSION_STR "4.3.1"
++#define PHONON_VERSION_STR "4.4.0"
+ 
+ QT_BEGIN_HEADER
+ QT_BEGIN_NAMESPACE
diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix
index a36d7870cc2..c208d5b9fe6 100644
--- a/pkgs/development/libraries/readline/readline5.nix
+++ b/pkgs/development/libraries/readline/readline5.nix
@@ -1,11 +1,14 @@
-args: with args;
+{ stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation {
   name = "readline-5.2";
+  
   src = fetchurl {
     url = mirror://gnu/readline/readline-5.2.tar.gz;
     sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j";
   };
+  
   propagatedBuildInputs = [ncurses];
+  
   patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
 }
diff --git a/pkgs/development/libraries/redland/1.0.10.nix b/pkgs/development/libraries/redland/1.0.10.nix
index 959581d407e..8d28ed9cd9f 100644
--- a/pkgs/development/libraries/redland/1.0.10.nix
+++ b/pkgs/development/libraries/redland/1.0.10.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
     librdf_raptor librdf_rasqal
   ];
 
+  preConfigure = ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lrasqal -lraptor"
+  '';
+
   configureFlags =
     [ "--with-threads" ]
     ++ stdenv.lib.optional (bdb != null) "--with-bdb=${bdb}";
diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix
index 40e15866099..90031c92fe4 100644
--- a/pkgs/development/libraries/rubberband/default.nix
+++ b/pkgs/development/libraries/rubberband/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw
+, vampSDK, ladspaH }:
+
 stdenv.mkDerivation {
   name = "rubberband-1.3";
 
@@ -7,13 +9,13 @@ stdenv.mkDerivation {
     sha256 = "0g1bihjzagp9mx9zppjyd9566dfdqh38a1ghwsd7c245hv2syri8";
   };
 
-  buildInputs = [pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH];
+  buildInputs = [ pkgconfig libsamplerate libsndfile fftw vampSDK ladspaH ];
 
   meta = { 
-    description = "high quality software library for audio time-stretching and pitch-shifting";
+    description = "High quality software library for audio time-stretching and pitch-shifting";
     homepage = http://www.breakfastquay.com/rubberband/index.html;
     license = ["GPL"]; # commercial license availible as well, see homepage. You'll get some more optimized routines
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix
index cb18a8509bf..f9de62e7cfa 100644
--- a/pkgs/development/libraries/science/biology/biolib/default.nix
+++ b/pkgs/development/libraries/science/biology/biolib/default.nix
@@ -1,8 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, cmake, rLang, zlib }:
 
 stdenv.mkDerivation rec {
   name = "biolib";
+  
   version = "0.0.1";
+  
   src = fetchurl {
     url = "http://bio3.xparrot.eu/download/nix-biology/biolib-${version}.tar.gz";
     sha256 = "1la639rs0v4f3ayvarqv0yxwlnwn188bb1v71d2ybw1xr6gdy688";
@@ -11,11 +13,14 @@ stdenv.mkDerivation rec {
   buildInputs = [cmake rLang zlib];
 
   meta = {
-    description     = "BioLib";
-    longDescription = ''BioLib brings together a set of opensource libraries
-written in C/C++ and makes them available for major Bio* languages: BioPerl,
-BioRuby, BioPython'';
-    license     = "GPL2";
-    homepage    = http://biolib.open-bio.org/; 
+    description = "BioLib";
+    longDescription =
+      ''
+        BioLib brings together a set of opensource libraries written
+        in C/C++ and makes them available for major Bio* languages:
+        BioPerl, BioRuby, BioPython
+      '';
+    license = "GPL2";
+    homepage = http://biolib.open-bio.org/; 
   };
 }
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 5d9167d00ec..e2d9083eda4 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation {
   name = "atlas-3.9.11";
+  
   src = fetchurl {
     url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2;
     sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677";
@@ -13,11 +14,11 @@ stdenv.mkDerivation {
   # the manual says you should pass -fPIC as configure arg .. It works
   configureFlags = "-Fa alg -fPIC";
 
-  buildInputs = [gfortran];
+  buildInputs = [ gfortran ];
 
   meta = {
-    description     = "Atlas library";
-    license     = "GPL";
-    homepage    = http://math-atlas.sourceforge.net/;
+    description = "Atlas library";
+    license = "GPL";
+    homepage = http://math-atlas.sourceforge.net/;
   };
 }
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index eeaf28aec3c..55654586edd 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -24,7 +24,17 @@ stdenv.mkDerivation {
     echo >>make.inc "BLASLIB = libblas.so.3.0.3"
   '';
 
+  buildPhase = ''
+    make
+    echo >>make.inc "ARCHFLAGS = "
+    echo >>make.inc "BLASLIB = libblas.a"
+    echo >>make.inc "ARCH = ar rcs"
+    echo >>make.inc "RANLIB = ranlib"
+    make
+  '';
+ 
   installPhase = ''
+    install -D -m755 libblas.a "$out/lib/libblas.a"
     install -D -m755 libblas.so.3.0.3 "$out/lib/libblas.so.3.0.3"
     ln -s libblas.so.3.0.3 "$out/lib/libblas.so.3"
     ln -s libblas.so.3.0.3 "$out/lib/libblas.so"
diff --git a/pkgs/development/libraries/science/math/liblapack/blas-link.patch b/pkgs/development/libraries/science/math/liblapack/blas-link.patch
index 7770142be77..e1ff853a291 100644
--- a/pkgs/development/libraries/science/math/liblapack/blas-link.patch
+++ b/pkgs/development/libraries/science/math/liblapack/blas-link.patch
@@ -6,7 +6,7 @@ diff -Naur lapack-3.2.old/SRC/Makefile lapack-3.2/SRC/Makefile
  
  ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
 -	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
-+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) -lblas
++	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) ${BLASLIB}
  	$(RANLIB) $@
  
  single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
@@ -18,7 +18,7 @@ diff -Naur lapack-3.2.old/TESTING/MATGEN/Makefile lapack-3.2/TESTING/MATGEN/Make
  ../../$(TMGLIB): $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN)	\
  		$(ZMATGEN) $(DZATGEN)
 -	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
-+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) -lblas
++	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) ${BLASLIB}
  	$(RANLIB) $@
  
  single: $(SMATGEN) $(SCATGEN)
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index 240d13105f8..a731360be56 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -33,10 +33,30 @@ stdenv.mkDerivation {
   buildPhase = ''
     make clean
     make lib
+    echo >make.inc  "SHELL = ${stdenv.shell}"
+    echo >>make.inc "PLAT ="
+    echo >>make.inc "FORTRAN = gfortran"
+    echo >>make.inc "OPTS = -O2 -fPIC"
+    echo >>make.inc "DRVOPTS = \$(OPTS)"
+    echo >>make.inc "NOOPT = -O0 -fPIC"
+    echo >>make.inc "LOADER = gfortran"
+    echo >>make.inc "LOADOPTS = "
+    echo >>make.inc "TIMER = INT_ETIME"
+    echo >>make.inc "ARCH = ar rcs"
+    echo >>make.inc "RANLIB = ranlib"
+    echo >>make.inc "BLASLIB = "
+    echo >>make.inc "ARCHFLAGS ="
+    echo >>make.inc "LAPACKLIB    = liblapack.a"
+    echo >>make.inc "TMGLIB       = tmglib.a"
+    echo >>make.inc "EIGSRCLIB    = eigsrc.a"
+    echo >>make.inc "LINSRCLIB    = linsrc.a"
+    make clean
+    make lib
   '';
 
   installPhase = ''
     ensureDir "$out/lib"
+    install -m755 *.a* "$out/lib"
     install -m755 *.so* "$out/lib"
     ln -sf liblapack.so.3 "$out/lib/liblapack.so"
     ln -sf libtmglib.so.3 "$out/lib/libtmglib.so"
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index df241623b39..7776b4d0259 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -1,30 +1,31 @@
-# alsaLib vorbisTools python can be made  optional
+# alsaLib vorbisTools python can be made optional
 
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }:
+
+stdenv.mkDerivation {
   name = "snack-2.2.10";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz;
     sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb";
   };
 
-  configureFlags = "--with-tcl=${args.tcl}/lib --with-tk=${args.tk}/lib";
+  configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib";
 
-  postUnpack=''sourceRoot="$sourceRoot/unix"'';
+  postUnpack = ''sourceRoot="$sourceRoot/unix"'';
 
-  buildInputs =(with args; [python tcl tk vorbisTools pkgconfig x11]);
+  buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ];
 
-  postInstall="aoeu";
+  postInstall = "aoeu";
 
-  installPhase=''
+  installPhase = ''
     ensureDir $out
     make install DESTDIR="$out" 
   '';
 
   meta = { 
-      description = "The Snack Sound Toolkit (Tcl)";
-      homepage = "http://www.speech.kth.se/snack/";
-      license = "GPL-2";
+    description = "The Snack Sound Toolkit (Tcl)";
+    homepage = http://www.speech.kth.se/snack/;
+    license = "GPL-2";
   };
 }
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 5e852e3e245..93a01a3d2bc 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -1,10 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, libogg }:
 
 stdenv.mkDerivation rec {
   name = "speex-1.2rc1";
+  
   src = fetchurl {
     url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
-	sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl";
+    sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl";
   };
-  buildInputs = [libogg];
+  
+  buildInputs = [ libogg ];
 }
diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix
new file mode 100644
index 00000000000..00558fc52e9
--- /dev/null
+++ b/pkgs/development/libraries/suitesparse/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, fetchurl
+, blas
+, liblapack
+}:
+stdenv.mkDerivation {
+  name = "suitespare";
+  src = fetchurl {
+    url = http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-3.5.0.tar.gz ;
+    sha256 = "0npn7c1j5qag5m2r0cmh3bwc42c1jk8k2yg2cfyxlcrp0h7wn4rc";  			
+  };
+  buildInputs = [blas liblapack] ;
+  patches = [./disable-metis.patch];
+
+  preConfigure = ''
+    export PREFIX=$out
+    ensureDir $out/lib
+    ensureDir $out/include
+  '';
+
+  NIX_CFLAGS = "-fPIC";
+
+}
diff --git a/pkgs/development/libraries/suitesparse/disable-metis.patch b/pkgs/development/libraries/suitesparse/disable-metis.patch
new file mode 100644
index 00000000000..68fd22bc643
--- /dev/null
+++ b/pkgs/development/libraries/suitesparse/disable-metis.patch
@@ -0,0 +1,140 @@
+diff -Nrc SuiteSparse/UFconfig/Makefile SuiteSparse-new/UFconfig/Makefile
+*** SuiteSparse/UFconfig/Makefile	2009-11-11 20:59:08.000000000 +0100
+--- SuiteSparse-new/UFconfig/Makefile	2010-08-02 13:14:04.000000000 +0200
+***************
+*** 25,31 ****
+  
+  # install UFconfig
+  install:
+! 	$(CP) Lib/libufconfig.a $(INSTALL_LIB)/libufconfig.$(VERSION).a
+  	( cd $(INSTALL_LIB) ; ln -s libufconfig.$(VERSION).a libufconfig.a )
+  	$(CP) UFconfig.h $(INSTALL_INCLUDE)
+  
+--- 25,31 ----
+  
+  # install UFconfig
+  install:
+! 	$(CP) libufconfig.a $(INSTALL_LIB)/libufconfig.$(VERSION).a
+  	( cd $(INSTALL_LIB) ; ln -s libufconfig.$(VERSION).a libufconfig.a )
+  	$(CP) UFconfig.h $(INSTALL_INCLUDE)
+  
+diff -Nrc SuiteSparse/UFconfig/UFconfig.mk SuiteSparse-new/UFconfig/UFconfig.mk
+*** SuiteSparse/UFconfig/UFconfig.mk	2010-06-02 17:40:42.000000000 +0200
+--- SuiteSparse-new/UFconfig/UFconfig.mk	2010-08-02 14:55:27.000000000 +0200
+***************
+*** 34,40 ****
+  # performance.  You should select the optimization parameters that are best
+  # for your system.  On Linux, use "CFLAGS = -O3 -fexceptions" for example.
+  CC = cc
+! CFLAGS = -O3 -fexceptions
+  
+  # C++ compiler (also uses CFLAGS)
+  CPLUSPLUS = g++
+--- 34,40 ----
+  # performance.  You should select the optimization parameters that are best
+  # for your system.  On Linux, use "CFLAGS = -O3 -fexceptions" for example.
+  CC = cc
+! CFLAGS = -O3 -fexceptions -fPIC
+  
+  # C++ compiler (also uses CFLAGS)
+  CPLUSPLUS = g++
+***************
+*** 71,78 ****
+  # MAKE = gmake
+  
+  # For "make install"
+! INSTALL_LIB = /usr/local/lib
+! INSTALL_INCLUDE = /usr/local/include
+  
+  #------------------------------------------------------------------------------
+  # BLAS and LAPACK configuration:
+--- 71,78 ----
+  # MAKE = gmake
+  
+  # For "make install"
+! INSTALL_LIB = $(out)/lib
+! INSTALL_INCLUDE = $(out)/include
+  
+  #------------------------------------------------------------------------------
+  # BLAS and LAPACK configuration:
+***************
+*** 127,134 ****
+  # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+  # You may wish to use an absolute path.  METIS is optional.  Compile
+  # CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+! METIS_PATH = ../../metis-4.0
+! METIS = ../../metis-4.0/libmetis.a
+  
+  # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
+  # options:
+--- 127,134 ----
+  # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+  # You may wish to use an absolute path.  METIS is optional.  Compile
+  # CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+! #METIS_PATH = ../../metis-4.0
+! #METIS = 
+  
+  # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
+  # options:
+***************
+*** 189,195 ****
+  # -DNSUNPERF	    for Solaris only.  If defined, do not use the Sun
+  #			Performance Library
+  
+! CHOLMOD_CONFIG =
+  
+  #------------------------------------------------------------------------------
+  # SuiteSparseQR configuration:
+--- 189,195 ----
+  # -DNSUNPERF	    for Solaris only.  If defined, do not use the Sun
+  #			Performance Library
+  
+! CHOLMOD_CONFIG = -DNPARTITION
+  
+  #------------------------------------------------------------------------------
+  # SuiteSparseQR configuration:
+***************
+*** 203,209 ****
+  # -DHAVE_TBB        enable the use of Intel's Threading Building Blocks (TBB)
+  
+  # default, without timing, without TBB:
+! SPQR_CONFIG =
+  # with timing and TBB:
+  # SPQR_CONFIG = -DTIMING -DHAVE_TBB
+  # with timing
+--- 203,209 ----
+  # -DHAVE_TBB        enable the use of Intel's Threading Building Blocks (TBB)
+  
+  # default, without timing, without TBB:
+! SPQR_CONFIG = -DNPARTITION
+  # with timing and TBB:
+  # SPQR_CONFIG = -DTIMING -DHAVE_TBB
+  # with timing
+diff -Nrc SuiteSparse/UMFPACK/Demo/Makefile SuiteSparse-new/UMFPACK/Demo/Makefile
+*** SuiteSparse/UMFPACK/Demo/Makefile	2009-11-11 21:09:45.000000000 +0100
+--- SuiteSparse-new/UMFPACK/Demo/Makefile	2010-08-02 12:53:16.000000000 +0200
+***************
+*** 40,51 ****
+  ../../CAMD/Lib/libcamd.a:
+  	( cd ../../CAMD ; $(MAKE) library )
+  
+- ../../metis-4.0/libmetis.a:
+- 	( cd ../../metis-4.0/Lib ; $(MAKE) )
+  
+  UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
+      ../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \
+!     ../../CAMD/Lib/libcamd.a ../../metis-4.0/libmetis.a \
+      ../../CCOLAMD/Lib/libccolamd.a
+  
+  libs: $(UMFPACK)
+--- 40,49 ----
+  ../../CAMD/Lib/libcamd.a:
+  	( cd ../../CAMD ; $(MAKE) library )
+  
+  
+  UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
+      ../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \
+!     ../../CAMD/Lib/libcamd.a \
+      ../../CCOLAMD/Lib/libccolamd.a
+  
+  libs: $(UMFPACK)
diff --git a/pkgs/development/libraries/telepathy-gabble/default.nix b/pkgs/development/libraries/telepathy-gabble/default.nix
index 67ffa950c95..c188f271742 100644
--- a/pkgs/development/libraries/telepathy-gabble/default.nix
+++ b/pkgs/development/libraries/telepathy-gabble/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, loudmouth }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-gabble-0.7.2";
diff --git a/pkgs/development/libraries/telepathy-glib/default.nix b/pkgs/development/libraries/telepathy-glib/default.nix
index 76485404568..5864253bbb4 100644
--- a/pkgs/development/libraries/telepathy-glib/default.nix
+++ b/pkgs/development/libraries/telepathy-glib/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
   name = "telepathy-glib-0.7.0";
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
new file mode 100644
index 00000000000..5b3b119cb1d
--- /dev/null
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, libtiff, libpng, libjpeg, doxygen, python, fftw }:
+stdenv.mkDerivation {
+  name = "vigra-1.7.0";
+
+  src = fetchurl {
+    url = http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.7.0-src.tar.gz;
+    sha256 = "1laf9p0h35xpzs98yd13alm17gh40sn9b7z01ylcja4g7p3a3hs4";
+  };
+
+  buildInputs = [ cmake fftw libtiff libpng libjpeg doxygen python ];
+
+  cmakeFlags = if (stdenv.system == "x86_64-linux") then
+      "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
+    else
+      "";
+
+  meta = {
+    description = "Novel computer vision C++ library with customizable algorithms and data structures";
+    homepage = http://hci.iwr.uni-heidelberg.de/vigra/;
+    license = "MIT";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index ead8ce20a84..7fdfb5aa06a 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -13,7 +13,7 @@ rec {
     gettext libjpeg libpng libtiff libxml2 libxslt pango
     sqlite icu gperf bison flex autoconf automake libtool 
     perl intltool pkgconfig libsoup gtkdoc libXt libproxy
-    enchant 
+    enchant python ruby
     ];
 
   propagatedBuildInputs = [
@@ -23,14 +23,27 @@ rec {
   configureCommand = "./autogen.sh ";
   configureFlags = [
     "--enable-3D-transforms"
-    "--enable-filters"
     "--enable-web-sockets"
-    # WML fails recent builds..
+    "--enable-indexeddb"
+    "--enable-image-resizer"
+
+    # https://bugs.webkit.org/show_bug.cgi?id=41859
+    # "--enable-mathml"
+
+    # "--enable-blob-slice"
+    
+    # Seem incomplete as of now
+    # "--enable-file-reader"
+    # "--enable-file-writer"
+
+    # https://bugs.webkit.org/show_bug.cgi?id=40765
     # "--enable-wml"
+
+    # "--enable-xhtmlmp"
     ];
 
   /* doConfigure should be specified separately */
-  phaseNames = ["setVars" "paranoidFixComments" "doConfigure" (doPatchShebangs ".") 
+  phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") 
     "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
 
   setVars = fullDepEntry (''
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 6dd81f7d852..0400018168d 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="r53178";
-   name="webkit-r53178";
-   hash="0452kfqd73igmkgp0v4w13lk3ycypqz4zl9hnspg7ns5vlyknqcn";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r53178.tar.bz2";
+   version="r62632";
+   name="webkit-r62632";
+   hash="138b1iyp97v2sy8cqqkbgr9gpj954as0ndb13s738raj3yn5bc5g";
+   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r62632.tar.bz2";
+   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r62632.tar.bz2";
   
   
 }
diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix
index 28bab029172..e1238578edc 100644
--- a/pkgs/development/libraries/wvstreams/default.nix
+++ b/pkgs/development/libraries/wvstreams/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, qt4, dbus, zlib, openssl, readline, perl }:
+
 stdenv.mkDerivation {
   name = "wvstreams-4.6.1";
 
@@ -11,13 +12,13 @@ stdenv.mkDerivation {
     find -type f | xargs sed -i 's@/bin/bash@bash@g'
   '';
 
-  buildInputs = [qt4 dbus zlib openssl readline perl];
+  buildInputs = [ qt4 dbus zlib openssl readline perl ];
 
   meta = {
-    description = "network programming library in C++";
+    description = "Network programming library in C++";
     homepage = http://alumnit.ca/wiki/index.php?page=WvStreams;
     license = "LGPL";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 6928f9f6df4..4bd1c97fb6c 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, yasm}:
 
 stdenv.mkDerivation rec {
-  version = "snapshot-20100429-2245";
+  version = "snapshot-20100624-2245";
   name = "x264-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
-    sha256 = "16b24mc63zyp4h4fqyvgzbdclnhpay4l72yfqzwnzsnlby94zwcj";
+    sha256 = "0hva3j7h99hl3l1p32a1j6p35s5aakkg3plp8xx1wk6qplxhkqsq";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/xapian/bindings/1.0.14.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index 28eacd4e4e4..b2c172a4d57 100644
--- a/pkgs/development/libraries/xapian/bindings/1.0.14.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -1,19 +1,21 @@
-args: with args;
+{ composableDerivation, fetchurl, xapian, pkgconfig
+, python ? null, php ? null, ruby ? null }:
 
-let inherit (args.composableDerivation) composableDerivation wwf; in
-composableDerivation {} {
+let inherit (composableDerivation) wwf; in
 
-    name = "xapian-bindings-1.0.14";
+composableDerivation.composableDerivation {} {
 
-    src = fetchurl {
-      url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz;
-      sha256 = "060jjwddv6ws8iy3jkpl4zcrzzinkjvdblkl0gcja90qzl2j81q5";
-    };
+  name = "xapian-bindings-1.0.14";
 
-    buildInputs = [xapian pkgconfig];
+  src = fetchurl {
+    url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz;
+    sha256 = "060jjwddv6ws8iy3jkpl4zcrzzinkjvdblkl0gcja90qzl2j81q5";
+  };
+
+  buildInputs = [ xapian pkgconfig ];
 
-    # most interpreters aren't tested yet.. (see python for example how to do it)
-    flags =
+  # most interpreters aren't tested yet.. (see python for example how to do it)
+  flags =
          wwf {
            name = "python";
            enable = {
@@ -64,9 +66,8 @@ composableDerivation {} {
   };
 
   meta = { 
-      description = "bindings for the xapian library";
-      homepage = xapian.meta.homepage;
-      license = "GPLv2";
+    description = "Bindings for the Xapian library";
+    homepage = xapian.meta.homepage;
+    license = "GPLv2";
   };
-
 }
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 95c891e9bc7..a4a91960c0b 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, static ? false}:
 
-stdenv.mkDerivation {
-  name = "zlib-1.2.3";
+stdenv.mkDerivation (rec {
+  name = "zlib-1.2.5";
+  
   src = fetchurl {
-    url = http://www.zlib.net/zlib-1.2.3.tar.gz;
-    md5 = "debc62758716a169df9f62e6ab2bc634";
+    url = "http://www.zlib.net/${name}.tar.gz";
+    sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30";
   };
+
   configureFlags = if static then "" else "--shared";
 
   preConfigure = ''
@@ -21,4 +23,7 @@ stdenv.mkDerivation {
 
   # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.
   cygwinConfigureEnableShared = true;
-}
+  
+} // stdenv.lib.optionalAttrs (stdenv.system == "i686-cygwin") {
+  patches = [ ./no-shared.patch ];
+})
diff --git a/pkgs/development/libraries/zlib/no-shared.patch b/pkgs/development/libraries/zlib/no-shared.patch
new file mode 100644
index 00000000000..e26449ffd9f
--- /dev/null
+++ b/pkgs/development/libraries/zlib/no-shared.patch
@@ -0,0 +1,14 @@
+Support building the static library only.
+
+diff -ru -x '*~' zlib-1.2.5-orig/Makefile.in zlib-1.2.5/Makefile.in
+--- zlib-1.2.5-orig/Makefile.in	2010-04-20 06:12:21.000000000 +0200
++++ zlib-1.2.5/Makefile.in	2010-07-27 13:25:02.176322291 +0200
+@@ -168,7 +168,7 @@
+ 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
+ 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+ 	cp $(STATICLIB) $(DESTDIR)$(libdir)
+-	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
++	test -z "$(SHAREDLIBV)" || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ 	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
+ 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+ 	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
index 46782889dfb..06063db491e 100644
--- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
+++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
@@ -1,33 +1,32 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, writeTextFile, coreutils, gnumake, gcc, gnutar, bzip2, gnugrep, gnused, gawk }:
+
+stdenv.mkDerivation {
   name = "avr-gcc-libc";
 
-  srcBinutils = args.fetchurl {
+  srcBinutils = fetchurl {
     url = ftp://ftp.gnu.org/gnu/binutils/binutils-2.17.tar.bz2;
     sha256 = "0pm20n2l9ddgdpgzk3zhnbb8nbyb4rb2kvcw21pkd6iwybk3rhz2";
   };
 
-  srcGCC = args.fetchurl {
+  srcGCC = fetchurl {
     url = ftp://ftp.gnu.org/gnu/gcc/gcc-4.1.2/gcc-core-4.1.2.tar.bz2;
     sha256 = "07binc1hqlr0g387zrg5sp57i12yzd5ja2lgjb83bbh0h3gwbsbv";
   };
 
-  srcAVRLibc = args.fetchurl {
+  srcAVRLibc = fetchurl {
     url = http://www.very-clever.com/download/nongnu/avr-libc/avr-libc-1.4.5.tar.bz2;
     sha256 = "058iv3vs6syy01pfkd5894xap9zakjx8ki1bpjdnihn6vk6fr80l";
   };
 
-  buildInputs =(with args; []);
-
   phases = "doAll";
 
   # don't call any wired $buildInputs/nix-support/* scripts or such. This makes the build fail 
-  builder = args.writeTextFile {
+  builder = writeTextFile {
     name = "avrbinutilsgccavrlibc-builder-script";
     text =  ''
-    PATH=${args.coreutils}/bin:${args.gnumake}/bin:${args.gcc}/bin:${args.gnutar}/bin:${args.bzip2}/bin:${args.gnugrep}/bin:${args.gnused}/bin:${args.gawk}/bin
+    PATH=${coreutils}/bin:${gnumake}/bin:${gcc}/bin:${gnutar}/bin:${bzip2}/bin:${gnugrep}/bin:${gnused}/bin:${gawk}/bin
     # that's all a bit too hacky...!
-    for i in `cat ${args.gcc}/nix-support/propagated-user-env-packages`; do
+    for i in `cat ${gcc}/nix-support/propagated-user-env-packages`; do
       echo adding $i
       PATH=$PATH:$i/bin
     done
diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix
index b76f660c8c6..7c9fb19c275 100644
--- a/pkgs/development/misc/avr8-burn-omat/default.nix
+++ b/pkgs/development/misc/avr8-burn-omat/default.nix
@@ -1,17 +1,17 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation {
   name = "avr8-burn-omat-2.0.1";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://avr8-burn-o-mat.brischalle.de/AVR8_Burn-O-Mat_2_0_1.zip;
     sha256 = "0nqlrbsx7z5r3b9y9wb6b7wawa3yxwx07zn7l4g4s59scxah2skk";
   };
 
-  buildInputs =(with args; [unzip]);
+  buildInputs = [unzip];
 
   phases = "unpackPhase installPhase";
 
-
   # move to nix-support to not create that many symlinks..
   # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog)
   installPhase = ''
@@ -25,8 +25,8 @@ args.stdenv.mkDerivation {
   '';
 
   meta = { 
-      description = "gui tool for avrdude (nice to set fuse bits)";
-      homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html;
-      license = "GPLv3";
+    description = "GUI tool for avrdude";
+    homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html;
+    license = "GPLv3";
   };
 }
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index fa8b88d0834..eb523d69c12 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.83.0" a; 
+  version = a.lib.attrByPath ["version"] "0.83.1" a; 
   buildInputs = with a; [
     pkgconfig
   ];
@@ -13,7 +13,7 @@ in
 rec {
   src = fetchurl {
     url = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz";
-    sha256 = "14b1fwq9jyvg9qbbrmpk1264s9shm9n638hsgmkh9fn2lmd1vpc9";
+    sha256 = "168vrizxnszh16yk4acpfhy502w8i997d8l3w4i26kxgy433ha6f";
   };
 
   inherit buildInputs propagatedBuildInputs;
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 458a30116ae..9dad415d835 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -6,11 +6,14 @@
 { python, setuptools, makeWrapper, lib }:
 
 { name, namePrefix ? "python-", src, meta, patches ? []
+, installCommand ? ""
 , doCheck ? true, checkPhase ? "python setup.py test"
 , postInstall ? ""
 , ... } @ attrs:
 
 let
+    defaultInstallCommand = ''easy_install --prefix="$out" .'';
+
     # Return the list of recursively propagated build inputs of PKG.
     recursiveBuildInputs =
       pkg:
@@ -50,7 +53,7 @@ python.stdenv.mkDerivation (
 
     echo "installing \`${name}' with \`easy_install'..."
     export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-    easy_install --prefix="$out" .
+    ${if installCommand == "" then defaultInstallCommand else installCommand}
 
     ${postInstall}
   '';
diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 09f8591e971..8ce5cc23764 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -1,17 +1,20 @@
 { stdenv, fetchurl, python, gmp }:
 
+# TODO: Update to version 2.1.0 ASAP. The update works, but as of 2010-07-28
+#       the download site appears to be down.
+
 stdenv.mkDerivation rec {
-  name = "pycrypto-2.1.0";
-  
+  name = "pycrypto-2.0.1";
+
   src = fetchurl {
-    url = "http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${name}.tar.gz";
-    sha256 = "18nq49l8wplg54hz9h26n61rq49vjzmy5xzlkm1g0j82x8i1qgi5";
+    url = "http://pypi.python.org/packages/source/p/pycrypto/${name}.tar.gz";
+    sha256 = "2dff97ae70b6811157b516bf633405d09147ee1e2bfa06b0c657ad2c22de5800";
   };
-  
+
   buildInputs = [ python gmp ];
-  
+
   buildPhase = "true";
-  
+
   installPhase =
     ''
       python ./setup.py build_ext --library-dirs=${gmp}/lib
@@ -19,8 +22,8 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = http://www.dlitz.net/software/pycrypto/;
+    homepage = "http://www.pycrypto.org/";
     description = "Python Cryptography Toolkit";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.gnu;
   };
 }
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 86a79f1070e..0e282cf71f3 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -1,16 +1,16 @@
-a :  
-let 
+a :
+let
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.8" a; 
+  version = a.lib.attrByPath ["version"] "0.10" a;
   propagatedBuildInputs = with a; [
     openssl python
   ];
 in
 rec {
   src = fetchurl {
-    url = "http://prdownloads.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-${version}.tar.gz";
-    sha256 = "1qzzycjyp1qsw87msj9kg2q3h7il1bf4jkrwy841y0zi44fl3112";
+    url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-0.10.tar.gz";
+    sha256 = "4514f8960389042ca2587f9cb801a13f7990387753fc678680b0c084719b5b60";
   };
 
   inherit propagatedBuildInputs;
@@ -18,7 +18,7 @@ rec {
 
   /* doConfigure should be removed if not needed */
   phaseNames = ["installPythonPackage"];
-      
+
   name = "pyOpenSSL-" + version;
   meta = {
     description = "Python OpenSSL wrapper capable of checking certificates";
diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix
index 820e272dee1..e9d9ee76064 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.3";
+  name = "pyqt-x11-gpl-4.7.4";
   
   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.4.tar.gz;
+    sha256 = "0a7iqzp75hd29rvwhyqfmaj5ymd49wq8scysjkivhc5qkx5rh00r";
   };
   
   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 c1812bfec22..e2b5496aef8 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.2";
+  name = "sip-4.10.5";
   
   src = fetchurl {
     url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";
-    sha256 = "1vw810fa3g59r3cnfizxykq7dg84zcgs278cwrksk7rsgz8gdn9q";
+    sha256 = "1hkn2n5hvfcfz0xprwyy5dzjzndgmvlf7abjsd868pv3hxdx1rs8";
   };
   
   configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 227759fa959..9fc25aad64d 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, unzip }:
 
 # at runtime, need jdk
 
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 3842ca4a131..829dd89147f 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   patches = [ ./tmake.patch ];
 
   buildInputs = [ graphviz perl flex bison libX11 libXext ]
-    ++ (if qt != null then [ qt ] else []);
+    ++ (if (qt != null) then [ qt ] else []);
 
   prefixKey = "--prefix ";
   configureFlags = "--release"
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
 		 ;
 
   preConfigure =
-   (if qt == null
+   (if (qt == null)
     then ""
     else ''
       echo "using QTDIR=${qt}..."
       export QTDIR=${qt}
-    '');
+    ''); 
       # export CPLUS_INCLUDE_PATH="${qt}/include:$CPLUS_INCLUDE_PATH"
       # export LIBRARY_PATH="${qt}/lib:$LIBRARY_PATH"
 
diff --git a/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix b/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
index dcc41ce9238..70dcf61d78c 100644
--- a/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
+++ b/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "haddock";
-  version = "2.7.2"; # Haskell Platform 2010.1.0.0
+  version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   name = self.fname;
   sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82";
   extraBuildInputs = [alex happy];
diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix
index 248216bf673..06000e514e7 100644
--- a/pkgs/development/tools/haskell/uuagc/default.nix
+++ b/pkgs/development/tools/haskell/uuagc/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "uuagc";
-  version = "0.9.14";
+  version = "0.9.29";
   name = self.fname;
-  sha256 = "076250219874b03fc04473a71f6fc6e1c2324f3a65e98a6f7afcaa42de4dea0c";
+  sha256 = "325d395abcc1f8224400a3cd765dd187e6be64a782251aa33080aab008b8829e";
   extraBuildInputs = [uulib];
   meta = {
     description = "Attribute Grammar System of Universiteit Utrecht";
diff --git a/pkgs/development/tools/literate-programming/noweb/builder.sh b/pkgs/development/tools/literate-programming/noweb/builder.sh
deleted file mode 100644
index 0b5e5c6f634..00000000000
--- a/pkgs/development/tools/literate-programming/noweb/builder.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-source $stdenv/setup
-export BIN=$out/bin
-export LIB=$out/lib
-export MAN=$out/man
-# What location for texinputs (tex macro's used by noweb)?
-export TEXINPUTS=$out/share/texmf/tex/latex
-export SHELL
-makeFlags="-e"
-installFlags="-e"
-preInstall="mkdir -p $TEXINPUTS"
-genericBuild
diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix
index 37d9e685eb1..c173010928d 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -1,10 +1,23 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, gawk}:
 
 stdenv.mkDerivation {
-  name = "noweb-2.10c";
+  name = "noweb-2.11b";
   src = fetchurl {
-    url = http://nixos.org/tarballs/noweb-20060201.tar.gz;
-    md5 = "b4813c6bc0bab9004e57edc1d7e57638";
+    urls = [ "http://ftp.de.debian.org/debian/pool/main/n/noweb/noweb_2.11b.orig.tar.gz"
+             "ftp://www.eecs.harvard.edu/pub/nr/noweb.tgz"
+          ];
+    sha256 = "10hdd6mrk26kyh4bnng4ah5h1pnanhsrhqa7qwqy6dyv3rng44y9";
   };
-  builder = ./builder.sh;
+  preBuild = ''
+    cd src
+    makeFlags="BIN=$out/bin LIB=$out/lib MAN=$out/share/man TEXINPUTS=$out/share/texmf/tex/latex"
+  '';
+  preInstall=''mkdir -p $out/share/texmf/tex/latex'';
+  postInstall= ''
+    substituteInPlace $out/bin/cpif --replace "PATH=/bin:/usr/bin" ""
+    for f in $out/bin/{noweb,nountangle,noroots,noroff,noindex} $out/lib/*; do
+      substituteInPlace $f --replace "nawk" "${gawk}/bin/awk"
+    done
+  '';
+  patches = [ ./no-FAQ.patch ];
 }
diff --git a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
new file mode 100644
index 00000000000..3230924990b
--- /dev/null
+++ b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile	2006-06-12 22:14:20.000000000 +0200
++++ b/src/Makefile	2010-06-17 11:30:11.804018145 +0200
+@@ -198,7 +198,7 @@
+ 	(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
+ 	ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
+ 
+-source: FAQ
++source:
+ 	for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
+ 	sleep 1
+ 	for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index b6d48a8c681..64a758d5231 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   # Work around a known issue in Cygwin.  See
   # http://thread.gmane.org/gmane.comp.sysutils.autoconf.bugs/6822 for
   # details.
-  doCheck = (builtins.currentSystem != "i686-cygwin");
+  doCheck = (stdenv.system != "i686-cygwin");
 
   # Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
   # "fixed" path in generated files!
diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index e82237152c1..ca04293e345 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
   # "fixed" path in generated files!
   dontPatchShebangs = true;
 
+  patches = [ ./more-robust-silent-tests.patch ];
+
   meta = {
     homepage = http://www.gnu.org/software/automake/;
     description = "GNU Automake, a GNU standard-compliant makefile generator";
diff --git a/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch b/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch
new file mode 100644
index 00000000000..ca37c412ca2
--- /dev/null
+++ b/pkgs/development/tools/misc/automake/more-robust-silent-tests.patch
@@ -0,0 +1,45 @@
+Make these tests more robust.  Previously, they would fail if the name
+of the build directory contains `mv', which can very well happen with Nix.
+
+--- automake-1.11.1/tests/silent.test	2009-12-08 19:02:32.000000000 +0100
++++ automake-1.11.1/tests/silent.test	2010-07-05 13:15:20.000000000 +0200
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+-# Copyright (C) 2009  Free Software Foundation, Inc.
++# Copyright (C) 2009, 2010  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,
+@@ -65,7 +65,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
+ cat stdout
+ grep ' -c' stdout && Exit 1
+ grep ' -o foo' stdout && Exit 1
+-grep mv stdout && Exit 1
++grep '\<mv\>' stdout && Exit 1
+ grep 'CC    .*foo\.' stdout
+ grep 'CC .*bar\.' stdout
+ grep 'CC .*baz\.' stdout
+
+--- automake-1.11.1/tests/silent2.test	2009-12-08 19:02:32.000000000 +0100
++++ automake-1.11.1/tests/silent2.test	2010-07-05 15:42:08.000000000 +0200
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-# Copyright (C) 2009  Free Software Foundation, Inc.
++# Copyright (C) 2009, 2010  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
+@@ -67,7 +67,7 @@ $MAKE >stdout || { cat stdout; Exit 1; }
+ cat stdout
+ grep ' -c' stdout && Exit 1
+ grep ' -o foo' stdout && Exit 1
+-grep mv stdout && Exit 1
++grep '\<mv\>' stdout && Exit 1
+ grep 'CC .*foo\.' stdout
+ grep 'CC .*bar\.' stdout
+ grep 'CC .*baz\.' stdout
+
diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index ce2d36bebe8..3cfd8736d82 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -1,21 +1,22 @@
-args: with args;
+{ composableDerivation, fetchurl, yacc, flex, texLive }:
+
 let edf = composableDerivation.edf; in
+
 composableDerivation.composableDerivation {} {
   name="avrdude-5.4";
 
   src = fetchurl {
-      url = http://mirror.switch.ch/mirror/gentoo/distfiles/avrdude-5.4.tar.gz;
-      sha256 = "bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30";
+    url = http://mirror.switch.ch/mirror/gentoo/distfiles/avrdude-5.4.tar.gz;
+    sha256 = "bee4148c51ec95999d803cb9f68f12ac2e9128b06f07afe307d38966c0833b30";
   };
 
   configureFlags = [ "--disable-dependency-tracking" ];
 
-  buildInputs = [yacc flex];
+  buildInputs = [ yacc flex ];
 
   flags =
-         edf { name = "doc"; enable = { buildInputs = texLive;  configureFlags = ["--enable-doc"]; }; }
-      // edf { name = "parport"; }
-      ;
+       edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; }
+    // edf { name = "parport"; };
 
   cfg = {
     docSupport = false; # untested
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 8342dfcc728..dc1238cc47e 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "ccache-2.4";
+  name = "ccache-3.0";
   src = fetchurl {
-    url = http://samba.org/ftp/ccache/ccache-2.4.tar.gz;
-    sha256 = "435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0";
+    url = http://samba.org/ftp/ccache/ccache-3.0.tar.gz;
+    sha256 = "0mi8sfnlcp2pmp7nzb7894rv85v13zxrj0v3qgnwhny3gx2p5pgk";
   };
 
   meta = {
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index dd2856975bd..c91d826e3b3 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -1,20 +1,21 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, flex, bison }:
+
+stdenv.mkDerivation {
   name = "cproto-4.6";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/cproto/cproto-4.6.tar.gz;
     sha256 = "0ilhkx9iwc5bh65q47mf68p39iyk07d52fv00z431nl6qcb9hp9j";
   };
 
-  buildInputs =(with args; [flex bison]);
+  buildInputs = [flex bison];
 
   # patch made by Joe Khoobyar copied from gentoo bugs
-  patches= ./cproto_patch ;
+  patches = ./cproto_patch;
 
   meta = { 
-      description = "generate C function prototypes from C source code";
-      homepage = http://cproto.sourceforge.net/;
-      license = "public domain";
+    description = "Tool to generate C function prototypes from C source code";
+    homepage = http://cproto.sourceforge.net/;
+    license = "public domain";
   };
 }
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index edf2ee38946..0465b6d90a8 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "inotify-tools-3.13";
 
@@ -7,13 +8,10 @@ stdenv.mkDerivation {
     sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6";
   };
 
-  buildInputs = [];
-
   meta = {
-    description = "";
     homepage = http://sourceforge.net/projects/inotify-tools/;
     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/development/tools/misc/ltrace/0.5-3deb.nix b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
deleted file mode 100644
index d33f7ac566c..00000000000
--- a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-args : with args;	let 
-        patch = ./ltrace_0.5-3.diff.gz;
-	localDefs = with builderDefs;
-	 builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-	fetchurl {
-		url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz;
-		sha256 = "1nbjcnizc0w3p41g7hqf1qiany8qk4xs9g4zrlq4fpxdykdwla3v";
-	};
-
-		buildInputs = [elfutils ];
-		configureFlags = [];
-		goSrcDir = "
-			cd ltrace-*;
-		";
-		preBuild = fullDepEntry (''
-		  gunzip < ${patch} | patch -Np1
-		  sed -e s@-Werror@@ -i Makefile.in
-		'')["minInit" "doUnpack"];
-	};
-	in with localDefs;
-let
-	preConfigure = fullDepEntry ("
-		sed -e 's@-o root -g root@@' -i Makefile.in;
-	") [doUnpack minInit];
-in
-stdenv.mkDerivation rec {
-	name = "ltrace-0.5";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [preBuild preConfigure doConfigure doMakeInstall doForceShare]);
-	meta = {
-		description = "Library call tracer";
-		inherit src;
-	};
-}
diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
new file mode 100644
index 00000000000..a436f29df14
--- /dev/null
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, elfutils }:
+
+stdenv.mkDerivation rec {
+  name = "ltrace-0.5.3";
+
+  src = fetchurl {
+    url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.3.orig.tar.gz;
+    sha256 = "0cmyw8zyw8b1gszrwizcm53cr0mig1iw3kv18v5952m9spb2frjw";
+  };
+
+  buildInputs = [ elfutils ];
+
+  preBuild =
+    ''
+      makeFlagsArray=(INSTALL="install -c")
+    '';
+
+  meta = {
+    description = "Library call tracer";
+    homepage = http://www.ltrace.org/;
+  };
+}
diff --git a/pkgs/development/tools/misc/ltrace/ltrace_0.5-3.diff.gz b/pkgs/development/tools/misc/ltrace/ltrace_0.5-3.diff.gz
deleted file mode 100644
index 596e5ad6eb0..00000000000
--- a/pkgs/development/tools/misc/ltrace/ltrace_0.5-3.diff.gz
+++ /dev/null
Binary files differdiff --git a/pkgs/development/tools/misc/patchelf/0.6.nix b/pkgs/development/tools/misc/patchelf/0.6.nix
index dfdbf792a56..3774c44480d 100644
--- a/pkgs/development/tools/misc/patchelf/0.6.nix
+++ b/pkgs/development/tools/misc/patchelf/0.6.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-0.6pre20950";
+  name = "patchelf-0.6pre22275";
   
   src = fetchurl {
     url = "http://hydra.nixos.org/build/504657/download/2/patchelf-0.6pre22813.tar.bz2";
diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix
index 694dc940d92..732d3ab92c1 100644
--- a/pkgs/development/tools/misc/uisp/default.nix
+++ b/pkgs/development/tools/misc/uisp/default.nix
@@ -1,16 +1,15 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "uisp-20050207";
 
-  configureFlags="--disable-dependency-tracking";
-
   src = fetchurl {
     url = http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz;
     sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw";
   };
 
   meta = {
-    description = "tool for AVR microcontrollers which can interface to many hardware in-system programmers";
+    description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers";
     license = "GPL-2";
     homepage = http://savannah.nongnu.org/projects/uisp;
   };
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index 7d4380656e3..a883024690a 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -1,11 +1,9 @@
-args: with args;
+{ stdenv, fetchurl, libusb }:
 
 stdenv.mkDerivation {
-
   name = "usb-modeswitch-1.1.2";
 
-  src =
-    fetchurl {
+  src =fetchurl {
     url = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.2.tar.bz2";
     sha256 = "1wzhd0r49nh5y43qrvsi3c7a29206zwd6v8xlpb8dqm40xg3j9nz";
   };
@@ -18,13 +16,11 @@ stdenv.mkDerivation {
     makeFlags="DESTDIR=$out PREFIX=$out"
   '';
 
-  buildInputs = [libusb];
+  buildInputs = [ libusb ];
 
   meta = {
-    description = "...";
-    homepage = "TODO";
     license = "GPLv2";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 5d75e6ea152..4c92946008e 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,20 +1,25 @@
 # This package is only used to create the documentation of zsh-cvs
 # eg have a look at http://www.zsh.org/mla/users/2008/msg00715.html
 # latest release is newer though
-args: with args;
+
+{ stdenv, fetchurl, perl }:
+
 stdenv.mkDerivation {
   name = "yodl-2.14.3";
 
-  buildInputs = [perl];
+  buildInputs = [ perl ];
 
   src = fetchurl {
     url = "mirror://sourceforge/yodl/yodl_2.14.3.orig.tar.gz";
     sha256 = "0paypm76p34hap3d18vvks5rrilchcw6q56rvq6pjf9raqw8ynd4";
   };
-  patches = [(fetchurl {
-    url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz";
-    sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4";
-  })];
+  
+  patches =
+    [ (fetchurl {
+        url = "mirror://sourceforge/yodl/yodl_2.14.3-1.diff.gz";
+        sha256 = "176hlbiidv7p9051f04anzj4sr9dwlp9439f9mjvvgks47ac0qx4";
+      })
+    ];
 
   # This doesn't isntall docs yet, do you need them?
   installPhase = ''
diff --git a/pkgs/development/tools/parsing/alex/2.3.3.nix b/pkgs/development/tools/parsing/alex/2.3.3.nix
new file mode 100644
index 00000000000..7f6186970fa
--- /dev/null
+++ b/pkgs/development/tools/parsing/alex/2.3.3.nix
@@ -0,0 +1,12 @@
+{cabal, perl}:
+
+cabal.mkDerivation (self : {
+  pname = "alex";
+  version = "2.3.3"; # Haskell Platform 2010.2.0.0
+  name = self.fname;
+  sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8";
+  extraBuildInputs = [perl];
+  meta = {
+    description = "A lexical analyser generator for Haskell";
+  };
+})
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index a9cc8e0a408..ec302611053 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "byacc-1.9";
 
@@ -7,15 +8,14 @@ stdenv.mkDerivation {
     sha256 = "d61a15ac4ac007c188d0c0e99365f016f8d327755f43032b58e400754846f736";
   };
 
-  preConfigure = [
+  preConfigure =
     ''mkdir -p $out/bin
       sed -i "s@^DEST.*\$@DEST = $out/bin/yacc@" Makefile
-    ''
-  ];
+    '';
 
   meta = { 
-      description = "Berkeley YACC";
-      homepage = http://dickey.his.com/byacc/byacc.html;
-      license = "public domain";
+    description = "Berkeley YACC";
+    homepage = http://dickey.his.com/byacc/byacc.html;
+    license = "public domain";
   };
 }
diff --git a/pkgs/development/tools/parsing/happy/happy-1.18.5.nix b/pkgs/development/tools/parsing/happy/happy-1.18.5.nix
new file mode 100644
index 00000000000..c3cd406f127
--- /dev/null
+++ b/pkgs/development/tools/parsing/happy/happy-1.18.5.nix
@@ -0,0 +1,13 @@
+{cabal, mtl, perl}:
+
+cabal.mkDerivation (self : {
+  pname = "happy";
+  version = "1.18.5"; # Haskell Platform 2010.2.0.0
+  name = self.fname;
+  sha256 = "91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e";
+  extraBuildInputs = [perl];
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Happy is a parser generator for Haskell";
+  };
+})
diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix
index a5d7ea84ebf..0a7a12a6e17 100644
--- a/pkgs/development/tools/selenium/remote-control/default.nix
+++ b/pkgs/development/tools/selenium/remote-control/default.nix
@@ -1,6 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, jre }:
+
 # let version = "1.0-beta-2";
 let version = "1.0-SNAPSHOT-standalone";
+
 in stdenv.mkDerivation {
     /*
 
diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix
new file mode 100644
index 00000000000..8a79326bdea
--- /dev/null
+++ b/pkgs/games/blackshades/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchsvn, SDL, mesa, openal, libvorbis, freealut, SDL_image}:
+
+stdenv.mkDerivation rec {
+  name = "blackshades-svn-110";
+  src = fetchsvn {
+    url = svn://svn.icculus.org/blackshades/trunk;
+    rev = 110;
+    sha256 = "0kbrh1dympk8scjxr6av24qs2bffz44l8qmw2m5gyqf4g3rxf6ra";
+  };
+
+  NIX_LDFLAGS = "-lSDL_image";
+
+  buildInputs = [ SDL SDL_image mesa openal libvorbis freealut ];
+
+  patchPhase = ''
+    sed -i -e s,Data/,$out/opt/$name/Data/,g \
+      -e s,Data:,$out/opt/$name/Data/,g \
+      Source/*.cpp
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin $out/opt/$name
+    cp objs/blackshades $out/bin
+    cp -R Data IF* Readme $out/opt/$name/
+  '';
+
+  meta = {
+    homepage = http://icculus.org/blackshades/;
+    description = "Protect the VIP";
+    license = "free";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix
new file mode 100644
index 00000000000..64d94196c64
--- /dev/null
+++ b/pkgs/games/blackshadeselite/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchsvn, SDL, mesa, openal, libvorbis, freealut, SDL_image, popt}:
+
+stdenv.mkDerivation rec {
+  name = "blackshades-elite-svn-29";
+  src = fetchsvn {
+    url = svn://svn.gna.org/svn/blackshadeselite/trunk;
+    rev = 29;
+    sha256 = "1lkws5pqpgcgdlar11waikp6y41z678457n9jcik7nhn53cjjr1s";
+  };
+
+  NIX_LDFLAGS = "-lSDL_image";
+
+  buildInputs = [ SDL SDL_image mesa openal libvorbis freealut popt ];
+
+  patchPhase = ''
+    sed -i -e s,Data/,$out/opt/$name/Data/,g \
+      -e s,Data:,$out/opt/$name/Data/,g \
+      Source/*.cpp
+    sed -i -e s/-march=pentium-m// Makefile
+    sed -i -e '/include "Window.h"/a#include <cstring>' -e 's/strcmp/std::strcmp/' \
+      Source/Window.cpp
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin $out/opt/$name
+    cp objs/blackshades $out/bin/blackshadeselite
+    cp -R Data IF* Readme $out/opt/$name/
+  '';
+
+  meta = {
+    homepage = http://home.gna.org/blackshadeselite/;
+    description = "Fork of Black Shades";
+    license = "GPLv2+"; # Says its gna.org project page
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/default.nix
index 2b32020d8e9..0de0732b374 100644
--- a/pkgs/games/construo/0.2.2.nix
+++ b/pkgs/games/construo/default.nix
@@ -1,4 +1,5 @@
-args : with args;
+{ stdenv, fetchurl, builderDefs, libX11, zlib, xproto, mesa ? null, freeglut ? null }:
+
 	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 		fetchurl {
@@ -6,10 +7,7 @@ args : with args;
 			sha256 = "0c661rjasax4ykw77dgqj39jhb4qi48m0bhhdy42vd5a4rfdrcck";
 		};
 
-		buildInputs = [libX11 zlib xproto]
-		++ (if args ? mesa then [args.mesa args.freeglut] else [])
-		;
-		configureFlags = [""];
+		buildInputs = [libX11 zlib xproto mesa freeglut];
 		preConfigure = builderDefs.stringsWithDeps.fullDepEntry (''
 		  sed -e 's/math[.]h/cmath/' -i vector.cxx
 		  sed -e 's/games/bin/' -i Makefile.in
diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix
deleted file mode 100644
index 837685db2d9..00000000000
--- a/pkgs/games/fsg/alt-builder.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-args: with args; 
-	let localDefs = builderDefs.passthru.function {
-  		buildInputs =[mesa wxGTK libX11 xproto];
-		  src = 
-			fetchurl {
-				url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
-				sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
-			};
-	};
-	in with localDefs;
-let 
-	preBuild = fullDepEntry "
-		sed -e '
-		s@currentProbIndex != 100@0@;
-		' -i MainFrame.cpp;
-	" [minInit];
-
-  installPhase = fullDepEntry "
-		ensureDir \$out/bin \$out/libexec;
-		cp sand \$out/libexec;
-		echo -e '#! /bin/sh\nLC_ALL=C '\$out'/libexec/sand \"$@\"' >\$out/bin/fsg;
-		chmod a+x \$out/bin/fsg;
-	" [minInit defEnsureDir];
-in
-stdenv.mkDerivation {
-  name = "fsg-4.4";
-	builder = writeScript "fsg-4.4-builder"
-		(textClosure localDefs [doUnpack addInputs preBuild doMake installPhase doForceShare]);
-
-  meta = {
-    description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand";
-    inherit src;
-  };
-}
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index 029c93d6690..2752e565c58 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, mesa, wxGTK, libX11, xproto }:
 
 stdenv.mkDerivation {
   name = "fsg-4.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
   };
 
-  buildInputs = [gtk glib pkgconfig mesa wxGTK libX11 xproto];
+  buildInputs = [ gtk glib pkgconfig mesa wxGTK libX11 xproto ];
 
 /*  
 #	One day Unicode will overcome?
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index aaccc8b5171..ca974d63de2 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -1,16 +1,27 @@
-{stdenv, fetchurl, SDL, openal, freealut, zlib, libpng, python}:
+{ stdenv, fetchurl, cmake, SDL, openal, zlib, libpng, python, libvorbis }:
 
-stdenv.mkDerivation {
-  name = "gemrb-0.2.9";
+assert stdenv.gcc.libc != null;
+
+stdenv.mkDerivation rec {
+  name = "gemrb-0.6.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/gemrb/gemrb-0.2.9.tar.gz;
-    sha256 = "0mygig4icx87a5skdv33yiwn8q4mv55f5qsks4sn40hrs69gcih0";
+    url = "mirror://sourceforge/gemrb/${name}.tar.gz";
+    sha256 = "1jnid5nrasy0lglnx71zkvv2p59cxsnhvagy7r8lsmjild1k5l93";
   };
 
-  buildInputs = [SDL openal freealut libpng python];
+  buildInputs = [ cmake python openal SDL zlib libpng libvorbis ];
+
+  # Necessary to find libdl.
+  CMAKE_LIBRARY_PATH = "${stdenv.gcc.libc}/lib";
+
+  # Can't have -werror because of the Vorbis header files.
+  cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON";
 
-  configureFlags = "--with-zlib=${zlib}";
+  # !!! Ugly.  CMake passes library dependencies to the linker using
+  # the full path of the library rather than `-l...', and the
+  # ld-wrapper doesn't add the necessary `-rpath' flag.
+  NIX_LDFLAGS = "-rpath ${zlib}/lib -rpath ${libpng}/lib -rpath ${python}/lib -rpath ${openal}/lib -rpath ${SDL}/lib -rpath ${libvorbis}/lib";
 
   meta = {
     description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate";
diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix
new file mode 100644
index 00000000000..b58654f1f42
--- /dev/null
+++ b/pkgs/games/gltron/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, SDL, mesa, zlib, libpng, libvorbis, libmikmod, SDL_sound } :
+
+stdenv.mkDerivation rec {
+  name = "gltron-0.70";
+  src = fetchurl {
+    url = "mirror://sourceforge/gltron/${name}-source.tar.gz";
+    sha256 = "e0c8ebb41a18a1f8d7302a9c2cb466f5b1dd63e9a9966c769075e6b6bdad8bb0";
+  };
+
+  patches = [ ./gentoo-prototypes.patch ];
+
+  # The build fails, unless we disable the default -Wall -Werror
+  configureFlags = "--disable-warn";
+
+  buildInputs = [ SDL mesa zlib libpng libvorbis libmikmod SDL_sound ];
+
+  meta = {
+    homepage = http://www.gltron.org/;
+    description = "Game based on the movie Tron";
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/games/gltron/gentoo-prototypes.patch b/pkgs/games/gltron/gentoo-prototypes.patch
new file mode 100644
index 00000000000..71078ae553f
--- /dev/null
+++ b/pkgs/games/gltron/gentoo-prototypes.patch
@@ -0,0 +1,27 @@
+Taken from:
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/games-action/gltron/files/gltron-0.70-prototypes.patch?revision=1.1&view=markup
+
+scripting.h declares these params as const so make sure they're the same.
+
+--- a/nebu/scripting/scripting.c
++++ b/nebu/scripting/scripting.c
+@@ -169,16 +169,16 @@
+   return status;
+ }    
+ 
+-void scripting_RunFile(char *name) {
++void scripting_RunFile(const char *name) {
+   lua_dofile(L, name);
+ }
+ 
+-void scripting_Run(char *command) {
++void scripting_Run(const char *command) {
+   /* fprintf(stderr, "[command] %s\n", command); */
+   lua_dostring(L, command);
+ }
+ 
+-void scripting_RunFormat(char *format, ... ) {
++void scripting_RunFormat(const char *format, ... ) {
+   char buf[4096];
+   va_list ap;
+   va_start(ap, format);
diff --git a/pkgs/games/liquidwar/src-for-default.nix b/pkgs/games/liquidwar/src-for-default.nix
index 9fa40d77fa1..885a4a4499c 100644
--- a/pkgs/games/liquidwar/src-for-default.nix
+++ b/pkgs/games/liquidwar/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.0.7beta";
-   name="liquidwar-0.0.7beta";
-   hash="0wl54nfrcfkyacg14y0653xyy2wrlmfwlmfiqrrifv08kzgw6pgb";
+   version="0.0.8beta";
+   name="liquidwar-0.0.8beta";
+   hash="1qcwms44i9x2s38hy64w7xxjkb2j0bh7ril9hldkjy3z208s3wff";
    url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz";
-   advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.7beta/liquidwar6-0.0.7beta.tar.gz";
+   advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.8beta/liquidwar6-0.0.8beta.tar.gz";
   
   
 }
diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix
index 4adbe69f697..0dc156ca3b7 100644
--- a/pkgs/games/micropolis/default.nix
+++ b/pkgs/games/micropolis/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXpm, libXext, xextproto, byacc }:
+
 stdenv.mkDerivation {
   name = "micropolis";
 
@@ -7,24 +8,25 @@ stdenv.mkDerivation {
     sha256 = "1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc";
   };
 
-  patches = [
-    (fetchurl {
-      url = http://rmdir.de/~michael/micropolis_git.patch;
-      sha256 = "13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592";
-    })
-  ];
+  patches =
+    [ (fetchurl {
+        url = http://rmdir.de/~michael/micropolis_git.patch;
+        sha256 = "13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592";
+      })
+    ];
 
   buildInputs = [ libX11 libXpm libXext xextproto byacc ];
 
-  preConfigure = [
-    ''cd src
+  preConfigure =
+    ''
+      cd src
       sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm}/include/X11@" tk/makefile
       sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile
-    ''
-  ];
+    '';
 
-  postInstall = [ 
-    ''mkdir -p $out/bin
+  postInstall =
+    ''
+      mkdir -p $out/bin
       mkdir -p $out/usr/share/games/micropolis
       cd ..
       for d in activity cities images manual res; do
@@ -32,17 +34,16 @@ stdenv.mkDerivation {
       done
       cp Micropolis $out/usr/share/games/micropolis
       cat > $out/bin/micropolis << EOF 
-#!/bin/bash
-cd $out/usr/share/games/micropolis
-./Micropolis
-EOF
+      #!/bin/bash
+      cd $out/usr/share/games/micropolis
+      ./Micropolis
+      EOF
       chmod 755 $out/bin/micropolis
-    ''
-  ];
+    '';
 
   meta = { 
-      description = "GPL'ed version of S*m C*ty";
-      homepage = http://www.donhopkins.com/home/micropolis/;
-      license = "GPL";
+    description = "GPL'ed version of S*m C*ty";
+    homepage = http://www.donhopkins.com/home/micropolis/;
+    license = "GPL";
   };
 }
diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/default.nix
index 84a699d1a14..f2e12f22912 100644
--- a/pkgs/games/orbit/1.01.nix
+++ b/pkgs/games/orbit/default.nix
@@ -1,4 +1,7 @@
-args : with args; with builderDefs;
+{ stdenv, fetchurl, builderDefs, mesa, libXi, libXt, libXext, libX11
+, libXmu, freeglut, esound }:
+
+with builderDefs;
 	let localDefs = builderDefs.passthru.function (rec {
 		src = /* put a fetchurl here */
 		fetchurl {
diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix
new file mode 100644
index 00000000000..0124e2f448b
--- /dev/null
+++ b/pkgs/games/tremulous/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, fetchurl, unzip, mesa, libX11, SDL, openal }:
+stdenv.mkDerivation rec {
+  name = "tremulous-${version}";
+  version = "1.1.0";
+  src1 = fetchurl {
+    url = "mirror://sourceforge/tremulous/${name}.zip";
+    sha256 = "11w96y7ggm2sn5ncyaffsbg0vy9pblz2av71vqp9725wbbsndfy7";
+  };
+  # http://tremulous.net/wiki/Client_versions
+  src2 = fetchurl {
+    url = "http://releases.mercenariesguild.net/client/mgclient_source_Release_1.011.tar.gz";
+    sha256 = "1vrsi7va7hdp8k824663s1pyw9zpsd4bwwr50j7i1nn72b0v9a26";
+  };
+  src3 = fetchurl {
+    url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz";
+    sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql";
+  };
+  buildInputs = [ unzip mesa libX11 SDL openal ];
+  unpackPhase = ''
+    unzip $src1
+    cd tremulous
+    tar xvf $src2
+    mkdir mg_tremded_source
+    cd mg_tremded_source
+    tar xvf $src3
+    cd ..
+  '';
+  buildPhase = ''
+    cd Release_1.011
+    make
+    cd ..
+    cd mg_tremded_source
+    make
+    cd ..
+  '';
+  installPhase = ''
+    arch=$(uname -m | sed -e s/i.86/x86/)
+    ensureDir $out/opt/tremulous
+    cp -v Release_1.011/build/release-linux-$arch/tremulous.$arch $out/opt/tremulous/
+    cp -v mg_tremded_source/build/release-linux-$arch/tremded.$arch $out/opt/tremulous/
+    cp -rv base $out/opt/tremulous
+    ensureDir $out/bin
+    for b in tremulous tremded
+    do
+        cat << EOF > $out/bin/$b
+    #!/bin/sh
+    cd $out/opt/tremulous
+    ./$b.$arch "$@"
+    EOF
+        chmod +x $out/bin/$b
+    done
+  '';
+  meta = {
+    description = "A game that blends a team based FPS with elements of an RTS";
+    longDescription = ''
+      Tremulous is a free, open source game that blends a team based FPS with
+      elements of an RTS. Players can choose from 2 unique races, aliens and
+      humans. Players on both teams are able to build working structures
+      in-game like an RTS. These structures provide many functions, the most
+      important being spawning. The designated builders must ensure there are
+      spawn structures or other players will not be able to rejoin the game
+      after death. Other structures provide automated base defense (to some
+      degree), healing functions and much more...
+    '';
+    homepage = http://www.tremulous.net;
+    license = [ "GPLv2" ];  # media under cc by-sa 2.5
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 54f70f48979..5433c0018a5 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango
+, gettext, zlib, boost, freetype, libpng, pkgconfig }:
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mrhgwp8iw27ifpavnf4y69zf9fqfy7j4sfwkfzsay226sp4gw3y";
   };
 
-  buildInputs = [SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost freetype libpng pkgconfig];
+  buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost freetype libpng pkgconfig ];
 
   configureFlags = "--with-preferences-dir=.${name} --program-suffix=-${version} --with-datadir-name=${name} --with-boost=${boost}/include --disable-python";
 
diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix
index 7fbd61c3e7a..1ca39ebc73b 100644
--- a/pkgs/games/zoom/default.nix
+++ b/pkgs/games/zoom/default.nix
@@ -1,14 +1,17 @@
-{stdenv, fetchurl, perl, expat, xlibs, freetype}:
+{stdenv, fetchurl, perl, expat, x11, freetype}:
 
 # !!! assert freetype == xlibs.freetype
 
 stdenv.mkDerivation {
   name = "zoom-1.0.2alpha1";
+  
   src = fetchurl {
     url = http://www.logicalshift.demon.co.uk/unix/zoom/zoom-1.0.2alpha1.tar.gz;
     md5 = "91b2fe444028178aa3b23bd0e3ae1a61";
   };
-  buildInputs = [perl expat xlibs freetype];
+  
+  buildInputs = [perl expat x11 freetype];
+  
   # Zoom doesn't add the right directory in the include path.
   CFLAGS = ["-I" (freetype + "/include/freetype2")];
 }
diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix
index c1903368291..f39b46db621 100644
--- a/pkgs/lib/attrsets.nix
+++ b/pkgs/lib/attrsets.nix
@@ -270,4 +270,9 @@ rec {
       else eqStrict pat val
     ) [pattern attrs]));
 
+  # override only the attributes that are already present in the old set
+  # useful for deep-overriding
+  overrideExisting = old: new:
+  old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] (getAttr attr old) new)) (attrNames old));
+
 }
diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix
index 334c8036627..7b4b390cbef 100644
--- a/pkgs/lib/customisation.nix
+++ b/pkgs/lib/customisation.nix
@@ -53,15 +53,39 @@ rec {
     { override = newArgs:
         makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs));
       deepOverride = newArgs:
-        makeOverridable f ((lib.mapAttrs (deepOverride newArgs) origArgs) // newArgs);
+        makeOverridable f (lib.overrideExisting (lib.mapAttrs (deepOverrider newArgs) origArgs) newArgs);
       origArgs = origArgs;
     };
 
-
-  deepOverride = newArgs: name: x: if builtins.isAttrs x then (
+  deepOverrider = newArgs: name: x: if builtins.isAttrs x then (
     if x ? deepOverride then (x.deepOverride newArgs) else
     if x ? override then (x.override newArgs) else
     x) else x;
-    
-        
+
+
+  /* Call the package function in the file `fn' with the required
+    arguments automatically.  The function is called with the
+    arguments `args', but any missing arguments are obtained from
+    `autoArgs'.  This function is intended to be partially
+    parameterised, e.g.,
+
+      callPackage = callPackageWith pkgs;
+      pkgs = {
+        libfoo = callPackage ./foo.nix { };
+        libbar = callPackage ./bar.nix { };
+      };
+
+    If the `libbar' function expects an argument named `libfoo', it is
+    automatically passed as an argument.  Overrides or missing
+    arguments can be supplied in `args', e.g.
+
+      libbar = callPackage ./bar.nix {
+        libfoo = null;
+        enableX11 = true;
+      };
+  */
+  callPackageWith = autoArgs: fn: args:
+    let f = import fn; in
+    makeOverridable f ((builtins.intersectAttrs (builtins.functionArgs f) autoArgs) // args);
+
 }
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index eccf46ec1ce..b1fc7d80b36 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -12,6 +12,7 @@
   guibert = "David Guibert <david.guibert@gmail.com>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
+  phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
diff --git a/pkgs/lib/meta.nix b/pkgs/lib/meta.nix
index 56463361928..0c5841dd717 100644
--- a/pkgs/lib/meta.nix
+++ b/pkgs/lib/meta.nix
@@ -40,5 +40,9 @@ rec {
   */
   lowPrio = drv: addMetaAttrs { priority = "10"; } drv;
 
+  /* Increase the nix-env priority of the package, i.e., this
+     version/variant of the package will be preferred.
+  */
+  hiPrio = drv: addMetaAttrs { priority = "110"; } drv;
   
 }
diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix
index 32b30ee2fbf..91a37494744 100644
--- a/pkgs/lib/misc.nix
+++ b/pkgs/lib/misc.nix
@@ -19,12 +19,21 @@ rec {
   else 
     (y x);
   defaultMerge = x: y: x // (defaultMergeArg x y);
-  sumTwoArgs = f: x: y: 
-    f (defaultMerge x y);
   foldArgs = merger: f: init: x: 
-    let arg=(merger init (defaultMergeArg init x)); in  
+    let arg=(merger init (defaultMergeArg init x));
       # now add the function with composed args already applied to the final attrs
-    setAttrMerge "passthru" {} (f arg) ( x : x // { function = foldArgs merger f arg; } );
+        base = (setAttrMerge "passthru" {} (f arg) 
+                        ( z : z // rec { 
+                          function = foldArgs merger f arg; 
+			  args = (lib.attrByPath ["passthru" "args"] {} z) // x;
+                          } ));
+	withStdOverrides = base // {
+	   override = base.passthru.function;
+	   deepOverride = a : (base.passthru.function ((lib.mapAttrs (lib.deepOverrider a) base.passthru.args) // a));
+	   } ;
+        in
+	withStdOverrides;
+    
 
   # predecessors: proposed replacement for applyAndFun (which has a bug cause it merges twice)
   # the naming "overridableDelayableArgs" tries to express that you can
@@ -95,6 +104,11 @@ rec {
 
   
   # shortcut for attrByPath ["name"] default attrs
+  maybeAttrNullable = name: default: attrs:
+    if attrs == null then default else 
+    if (__hasAttr name attrs) then (__getAttr name attrs) else default;
+
+  # shortcut for attrByPath ["name"] default attrs
   maybeAttr = name: default: attrs:
     if (__hasAttr name attrs) then (__getAttr name attrs) else default;
 
@@ -112,22 +126,22 @@ rec {
     
   # Return true only if there is an attribute and it is true.
   checkFlag = attrSet: name:
-	if (name == "true") then true else
-	if (name == "false") then false else
-	if (elem name (attrByPath ["flags"] [] attrSet)) then true else
-	attrByPath [name] false attrSet ;
+        if (name == "true") then true else
+        if (name == "false") then false else
+        if (elem name (attrByPath ["flags"] [] attrSet)) then true else
+        attrByPath [name] false attrSet ;
 
 
   # Input : attrSet, [ [name default] ... ], name
   # Output : its value or default.
   getValue = attrSet: argList: name:
   ( attrByPath [name] (if checkFlag attrSet name then true else
-	if argList == [] then null else
-	let x = builtins.head argList; in
-		if (head x) == name then 
-			(head (tail x))
-		else (getValue attrSet 
-			(tail argList) name)) attrSet );
+        if argList == [] then null else
+        let x = builtins.head argList; in
+                if (head x) == name then 
+                        (head (tail x))
+                else (getValue attrSet 
+                        (tail argList) name)) attrSet );
 
                         
   # Input : attrSet, [[name default] ...], [ [flagname reqs..] ... ]
@@ -136,46 +150,46 @@ rec {
   (
     fold lib.and true 
       (map (x: let name = (head x) ; in
-	
-	((checkFlag attrSet name) -> 
-	(fold lib.and true
-	(map (y: let val=(getValue attrSet argList y); in
-		(val!=null) && (val!=false)) 
-	(tail x))))) condList)) ;
-	
+        
+        ((checkFlag attrSet name) -> 
+        (fold lib.and true
+        (map (y: let val=(getValue attrSet argList y); in
+                (val!=null) && (val!=false)) 
+        (tail x))))) condList)) ;
+        
 
   # !!! This function has O(n^2) performance, so you probably don't want to use it!
   uniqList = {inputList, outputList ? []}:
-	if (inputList == []) then outputList else
-	let x=head inputList; 
-	newOutputList = outputList ++
-	 (if elem x outputList then [] else [x]);
-	in uniqList {outputList=newOutputList; 
-		inputList = (tail inputList);};
+        if (inputList == []) then outputList else
+        let x=head inputList; 
+        newOutputList = outputList ++
+         (if elem x outputList then [] else [x]);
+        in uniqList {outputList=newOutputList; 
+                inputList = (tail inputList);};
 
   uniqListExt = {inputList, outputList ? [],
     getter ? (x : x), compare ? (x: y: x==y)}:
-	if (inputList == []) then outputList else
-	let x=head inputList; 
-	isX = y: (compare (getter y) (getter x));
-	newOutputList = outputList ++
-	 (if any isX outputList then [] else [x]);
-	in uniqListExt {outputList=newOutputList; 
-		inputList = (tail inputList);
-		inherit getter compare;
-		};
+        if (inputList == []) then outputList else
+        let x=head inputList; 
+        isX = y: (compare (getter y) (getter x));
+        newOutputList = outputList ++
+         (if any isX outputList then [] else [x]);
+        in uniqListExt {outputList=newOutputList; 
+                inputList = (tail inputList);
+                inherit getter compare;
+                };
 
 
                 
   condConcat = name: list: checker:
-	if list == [] then name else
-	if checker (head list) then 
-		condConcat 
-			(name + (head (tail list))) 
-			(tail (tail list)) 
-			checker
-	else condConcat
-		name (tail (tail list)) checker;
+        if list == [] then name else
+        if checker (head list) then 
+                condConcat 
+                        (name + (head (tail list))) 
+                        (tail (tail list)) 
+                        checker
+        else condConcat
+                name (tail (tail list)) checker;
 
   lazyGenericClosure = {startSet, operator}:
     let
@@ -196,7 +210,7 @@ rec {
     else lazyGenericClosure;
 
   innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else 
-	innerModifySumArgs f x (a // b);
+        innerModifySumArgs f x (a // b);
   modifySumArgs = f: x: innerModifySumArgs f x {};
 
 
@@ -204,8 +218,8 @@ rec {
     innerClosePropagation 
       (ready ++ [(head list)])
       ((tail list) 
-         ++ (maybeAttr "propagatedBuildInputs" [] (head list))
-	 ++ (maybeAttr "propagatedBuildNativeInputs" [] (head list)));
+         ++ (maybeAttrNullable "propagatedBuildInputs" [] (head list))
+         ++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list)));
 
   closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});
 
@@ -378,4 +392,16 @@ rec {
           (eqListStrict (attrNames a) (attrNames b))
           && (eqListStrict (lib.attrValues a) (lib.attrValues b))
         else a == b; # FIXME !
+
+
+  # Check absence of non-used options
+  # Obsolete?
+  checker = x: flag: opts: config:
+    (if flag then let result=(
+      (import ../build-support/checker)
+      opts config); in
+      (if (result=="") then x else
+      abort ("Unknown option specified: " + result))
+    else x);
+
 }
diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix
index d8f9692ae09..635b195e1d6 100644
--- a/pkgs/lib/platforms.nix
+++ b/pkgs/lib/platforms.nix
@@ -2,7 +2,7 @@ let lists = import ./lists.nix; in
 
 rec {
   gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
-  linux = ["i686-linux" "x86_64-linux" "powerpc-linux"];
+  linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux" ];
   darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"];
   freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"];
   openbsd = ["i686-openbsd" "x86_64-openbsd"];
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 0b8830a7bdc..2c363ed80d5 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,23 +1,16 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
 , dbus, libusb }:
 
-let version = "1.4.1"; in
+let version = "1.4.4"; in
 
 stdenv.mkDerivation {
   name = "cups-${version}";
 
   src = fetchurl {
     url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "1fnkq993hr8l87x6f7a7wik2spac3f7nn4wksrvwk690r8a6zxng";
+    md5 = "8776403ad60fea9e85eab9c04d88560d";
   };
 
-  patches =
-    [ (fetchurl {
-        url = http://www.cups.org/strfiles/3332/0001-Fixed-side_cb-function-declaration-in-usb-unix.c.patch;
-        sha256 = "0h8fhhpzp7xngnc428040jv09yvpz5dxb9hw6sv67lnvb03fncnw";
-      })
-    ];
-
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb ];
 
   propagatedBuildInputs = [ openssl ];
diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix
index aef8c239caf..feb42296c9d 100644
--- a/pkgs/misc/drivers/gutenprint/bin.nix
+++ b/pkgs/misc/drivers/gutenprint/bin.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, rpm, cpio, zlib }:
 
 assert stdenv.system == "x86_64-linux";
 
@@ -25,6 +25,7 @@ then. I've tried that.
 TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how to check ink levels etc
  
 */
+
 stdenv.mkDerivation {
   name = "cups-gutenprint-binary-5.0.1";
 
@@ -58,6 +59,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "some additional drivers including canon printer drivers";
+    description = "Some additional CUPS drivers including Canon drivers";
   };
 }
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 832aeb9793c..f1a01eefba5 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -1,12 +1,13 @@
 # this package was called gimp-print in the past
-{ fetchurl, stdenv, lib, pkgconfig, composableDerivation, cups
-, libtiff, libpng, openssl, git, gimp }@args :
+{ fetchurl, stdenv, pkgconfig, composableDerivation, cups
+, libtiff, libpng, openssl, gimp }:
 
 let
    version = "5.2.4";
-   inherit (args.composableDerivation) composableDerivation edf wwf;
+   inherit (composableDerivation) edf wwf;
 in
-composableDerivation {} {
+
+composableDerivation.composableDerivation {} {
   name = "gutenprint-${version}";
 
   src = fetchurl {
@@ -15,12 +16,14 @@ composableDerivation {} {
   };
 
   # gimp, gui is still not working (TODO)
-  buildInputs = [ openssl  pkgconfig];
+  buildInputs = [ openssl pkgconfig ];
 
   configureFlags = ["--enable-static-genppd"];
+  
   #preConfigure = ''
   #  configureFlags="--with-cups=$out/usr-cups $configureFlags"
   #'';
+  
   /*
      is this recommended? without it this warning is printed:
 
@@ -41,7 +44,7 @@ composableDerivation {} {
     license = "GPL";
   };
 
-  mergeAttrBy = { installArgs = lib.concat; };
+  mergeAttrBy = { installArgs = stdenv.lib.concat; };
 
   # most interpreters aren't tested yet.. (see python for example how to do it)
   flags =
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
new file mode 100644
index 00000000000..f5e9ad9d890
--- /dev/null
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -0,0 +1,47 @@
+{stdenv, fetchurl, cups, zlib, libjpeg, libusb, python, saneBackends, dbus, pkgconfig
+, qtSupport ? false, qt4
+}:
+
+stdenv.mkDerivation {
+  name = "hplip-3.10.5";
+
+  src = fetchurl {
+    url = "http://prdownloads.sourceforge.net/hplip/hplip-3.10.5.tar.gz";
+    sha256 = "1lyl9nrdaih64cqw6fa7ivjf7a74bq8zn0gkj1gap47b04my608p";
+  };
+
+  #preBuild=''
+  #  makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
+  #'';
+
+  prePatch = ''
+    sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in 
+  '';
+
+  preConfigure = ''
+    export configureFlags="$configureFlags
+      --with-cupsfilterdir=$out/lib/cups/filter
+      --with-cupsbackenddir=$out/lib/cups/backend
+      --with-icondir=$out/share/applications
+      --with-systraydir=$out/xdg/autostart
+      --with-mimedir=$out/etc/cups
+      # Until we have snmp
+      --disable-network-build"
+
+    export makeFlags="
+      halpredir=$out/share/hal/fdi/preprobe/10osvendor
+      hplip_statedir=$out/var
+      rulesdir=$out/etc/udev/rules.d
+      hplip_confdir=$out/etc/hp
+    ";
+  '';
+
+  buildInputs = [libjpeg cups libusb python saneBackends dbus pkgconfig] ++
+    stdenv.lib.optional qtSupport qt4;
+
+  meta = {
+    description = "Print, scan and fax HP drivers for Linux";
+    homepage = http://hplipopensource.com/;
+    license = "free"; # MIT/BSD/GPL
+  };
+}
diff --git a/pkgs/misc/emulators/wine/src-for-default.nix b/pkgs/misc/emulators/wine/src-for-default.nix
index 707d11beedf..b758282b35e 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.2-rc1";
-   name="wine-1.2-rc1";
-   hash="0d5gn85c277vasm9rsmjdn8x9a8dllbzphf6yhyq1agdc84g291b";
+   version="1.3.0";
+   name="wine-1.3.0";
+   hash="042mmkq55zgdz7617z7ihqvi9riqv0qc6c7z2f8f6nr5iavfviml";
    url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
-   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.2-rc1.tar.bz2";
+   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.0.tar.bz2";
   
   
 }
diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix
index ad165760f7a..fa2c36cf2c2 100644
--- a/pkgs/misc/freestyle/default.nix
+++ b/pkgs/misc/freestyle/default.nix
@@ -1,14 +1,17 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libQGLViewer
+, swig, python }:
+
+stdenv.mkDerivation {
   name = "freestyle-2.2.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/freestyle/freestyle.2.2.0-src.tar.bz2;
     sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga";
  };
 
-  buildInputs =(with args; [qt4 libpng lib3ds freeglut libXi libQGLViewer swig]);
-  inherit (args) python freeglut libQGLViewer lib3ds; # if you want to use another adopt patch and Config.pri 
+  buildInputs = [ qt4 libpng lib3ds freeglut libXi libQGLViewer swig ];
+  
+  inherit python freeglut libQGLViewer lib3ds; # if you want to use another adopt patch and Config.pri 
 
   buildPhase = ''
     export PYTHON_VERSION=2.5
@@ -36,15 +39,15 @@ args.stdenv.mkDerivation {
       $hide/Freestyle
     EOF
     chmod +x $out/bin/Freestyle
-    '';
+  '';
 
   patches = ./patch;
 
   installPhase = ":";
 
   meta = { 
-      description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
-      homepage = http://freestyle.sourceforge.net;
-      license = "GPL2";
+    description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
+    homepage = http://freestyle.sourceforge.net;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix
index 54418c1bc1e..ad126b45daa 100644
--- a/pkgs/misc/gxemul/default.nix
+++ b/pkgs/misc/gxemul/default.nix
@@ -1,13 +1,16 @@
-args: with args;
+{ composableDerivation, fetchurl }:
+
 let edf = composableDerivation.edf;
-    name = "gxemul-0.4.6"; in
-composableDerivation.composableDerivation {} {
+    name = "gxemul-0.4.6";
+in
 
+composableDerivation.composableDerivation {} {
   inherit name;
+  
   flags = {
-      doc   = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
-      demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
-      man   = { installPhase = "cp -r ./man \$out/;";};
+    doc   = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
+    demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
+    man   = { installPhase = "cp -r ./man \$out/;";};
   };
 
   cfg = {
@@ -23,11 +26,11 @@ composableDerivation.composableDerivation {} {
     sha256 = "0hf3gi6hfd2qr5090zimfiddcjgank2q6m7dfsr81wwpxfbhb2z3";
   };
 
-  configurePhase="./configure";
+  configurePhase = "./configure";
 
   meta = {
     license = "BSD";
-    description = "A Machine Emulator, Mainly emulates MIPS, but supports other CPU type";
+    description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types";
     homepage = http://gavare.se/gxemul/;
   };
 
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 5a302adc60d..f6eecdc787d 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,9 +1,20 @@
 # Perhaps we can get some ideas from here ? http://gentoo-wiki.com/HOWTO_Jack
 # still much to test but it compiles now
-args:
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
-  buildInputs = [ args.pkgconfig ];
+
+{ composableDerivation, fetchurl, pkgconfig, alsaLib }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
+  name = "jack-0.103.0";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/jackit/jack-audio-connection-kit-0.109.2.tar.gz";
+    sha256 = "1m5z8dzalqspsa63pkcgyns0cvh0kqwhb9g1ivcwvnz0bc7ag9r7";
+  };
+  
+  buildInputs = [ pkgconfig ];
+  
   flags =
       # FIXME: tidy up
        edf { name = "posix-shm"; } #use POSIX shm API
@@ -15,43 +26,23 @@ composableDerivation {} {
     // edf { name = "coreaudio"; }                     #ignore CoreAudio driver
     // edf { name = "oss"; }                           #ignore OSS driver
     // edf { name = "freebob"; }                       #ignore FreeBob driver
-    // edf { name = "alsa"; enable = { buildInputs=[args.alsaLib]; }; };
-
-    # altivec seems to be for mac only ?
-    #  altivec =           { configureFlags = ["--enable-altivec"]; };                        #enable Altivec support (default=auto)
-
-    # keeping default values by now:
-    # optimization_by_compiler = { configureFlags = ["--enable-optimization-by-compiler"]; }; [>use compiler (NOT processor) capabilities to determine optimization flags
-    # optimization_by_cpu = { configureFlags = ["--enable-optimization-by-cpu"]; };          [>use processor capabilities to determine optimization flags
+    // edf { name = "alsa"; enable = { buildInputs = [ alsaLib ]; }; };
 
-    # I think the default is ok
-    # mmx =              edf { name = "mmx"; };                           #enable MMX support (default=auto)
-    #sse =               edf { name = "sse"; };                            #enable SSE support (default=auto)
-    #dynsimd =           edf { name = "dynsimd"; };                        #enable dynamic SIMD selection (default=no)
-    #optimize =          edf { name = "optimize"; };                       #ask the compiler for its best optimizations
-    #resize =            edf { name = "resize"; };                         #enable buffer resizing feature
-    #ensure_mlock =      edf { name = "ensure-mlock"; };                   #fail if unable to lock memory
-    #debug =             edf { name = "debug"; };                          #enable debugging messages in jackd and libjack
-    #preemption_check =  edf { name = "preemption-check"; };               #
   cfg = {
     posix_shmSupport = true;
     timestampsSupport = true;
     alsaSupport = true;
   };
-  name = "jack-0.103.0";
-  src = args.fetchurl {
-    url = "mirror://sourceforge/jackit/jack-audio-connection-kit-0.109.2.tar.gz";
-    sha256 = "1m5z8dzalqspsa63pkcgyns0cvh0kqwhb9g1ivcwvnz0bc7ag9r7";
-  };
-  meta = {
-    description = "jack audio connection kit";
-    homepage = "http://jackaudio.org";
-    license = "GPL";
-  };
-
+  
   # make sure the jackaudio is found by symlinking lib64 to lib
   postInstall = ''
     ensureDir $out/lib
     ln -s $out/lib{64,}/pkgconfig
   '';
+  
+  meta = {
+    description = "JACK audio connection kit";
+    homepage = "http://jackaudio.org";
+    license = "GPL";
+  };
 }
diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index 76366d66f57..f30bf0a7e74 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -1,38 +1,29 @@
-# note: there is a jedit plugin
-args: with args;
+{ stdenv, fetchurl, ghostscript, texinfo, imagemagick, texi2html, guile
+, python, gettext, flex, perl, bison, pkgconfig, texLive
+, fontconfig, freetype, pango, fontforge, help2man }:
 
 stdenv.mkDerivation {
   name = "lilypond-2.13.9";
 
-  /*
-  # REGION AUTO UPDATE:    { name="lilypond"; type = "git"; url = "git://git.sv.gnu.org/lilypond.git"; }
-  src= sourceFromHead "lilypond-7d065cae414aac445a40c0c6646c3baf6f358cb3.tar.gz"
-               (throw "source not not published yet: lilypond");
-  # END
-  #preConfigure = "./autogen.sh";
-  */
-
   src = fetchurl {
     url = http://download.linuxaudio.org/lilypond/sources/v2.13/lilypond-2.13.9.tar.gz;
     sha256 = "1x3jz0zbhly4rc07nry3ia3ydd6vislz81gg0ivwfm6f6q0ssk57";
   };
 
   configureFlags = [ "--disable-documentation" "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"];
-  # configureFlags = "--disable-documentation";
-
-  buildInputs = [
-    automake autoconf
-    ghostscript texinfo imagemagick texi2html guile texinfo
-    python gettext flex perl bison pkgconfig texLive fontconfig freetype pango
-    fontforge help2man];
 
+  buildInputs =
+    [ ghostscript texinfo imagemagick texi2html guile
+      python gettext flex perl bison pkgconfig texLive fontconfig freetype pango
+      fontforge help2man
+    ];
 
   meta = { 
-    description = "music typesetting system";
+    description = "Music typesetting system";
     homepage = http://lilypond.org/;
     license = "GPL";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 
   patches = [ ./findlib.patch ];
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix
index 0b8a12799dd..63fb29a7eb3 100644
--- a/pkgs/misc/sane-backends/default.nix
+++ b/pkgs/misc/sane-backends/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, hotplugSupport ? false, libusb ? null,
-	gt68xxFirmware ? null}:
+{ stdenv, fetchurl, hotplugSupport ? false, libusb ? null
+, gt68xxFirmware ? null }:
 
 assert hotplugSupport -> stdenv.system == "i686-linux";
 
diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix
index 3996d9b08ef..d6b73ed16fe 100644
--- a/pkgs/misc/xosd/default.nix
+++ b/pkgs/misc/xosd/default.nix
@@ -1,5 +1,6 @@
-args: with args;
-stdenv.mkDerivation (rec {
+{ stdenv, fetchurl, libX11, libXext, libXt, xextproto, xproto }:
+
+stdenv.mkDerivation rec {
   pname = "xosd";
   version = "2.2.12";
 
@@ -10,9 +11,9 @@ stdenv.mkDerivation (rec {
     sha256 = "7d4ae8e1a6dbd7743af3b1cdc85144e2de26abe6daec25f4bd74bf311774df08";
   };
 
-  buildInputs = [libX11 libXext libXt xextproto xproto];
+  buildInputs = [ libX11 libXext libXt xextproto xproto ];
 
   meta = {
     description = "XOSD displays text on your screen";
   };
-})
+}
diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index 88203a31d3b..cfd88692ead 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -6,8 +6,10 @@
 assert (cross != null) -> (gccCross != null);
 
 let
-  date   = "2010-05-12";
-  rev    = "master@{${date}}";
+  # Unfortunately we can't use `master@{DATE}', see
+  # <http://www.bramschoenmakers.nl/en/node/645>.
+  date   = "20100512";
+  rev    = "7913beaef3e6a2c4f7f315a8db7a31dbe1f713e0";
   suffix = if headersOnly
            then "-headers"
            else (if buildTarget != "all"
diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix
index 11adc618791..6f978b0c76d 100644
--- a/pkgs/os-specific/gnu/libpthread/default.nix
+++ b/pkgs/os-specific/gnu/libpthread/default.nix
@@ -5,11 +5,11 @@
 assert (cross != null) -> (gccCross != null) && (glibcCross != null);
 
 let
-  date = "2010-05-12";
+  date = "20100512";
 
-  # Use the weird branch prescribed in
+  # Use the `tschwinge/Peter_Herbolzheimer' branch as prescribed in
   # <http://www.gnu.org/software/hurd/hurd/building/cross-compiling.html>.
-  rev = "tschwinge/Peter_Herbolzheimer@{${date}}";
+  rev = "c4bb52770f0b6703bef76c5abdd08663b46b4dc9";
 in
 stdenv.mkDerivation ({
   name = "libpthread-hurd-${date}";
@@ -56,10 +56,12 @@ stdenv.mkDerivation ({
    passthru = {
      # Extra target LDFLAGS to allow the cross-linker to find the
      # dependencies of the cross libpthread.so, namely libihash.so.
+     # Note: these are raw `ld' flags, so `-Wl,' must be prepended when using
+     # `gcc'.
      #
      # This is actually only useful while building the final cross-gcc, since
      # afterwards gcc-cross-wrapper should add the relevant flags.
-     TARGET_LDFLAGS = "-Wl,-rpath-link=${hurd}/lib";
+     TARGET_LDFLAGS = "-rpath-link=${hurd}/lib";
    };
  }
  else { }))
diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix
index 95b3921ee2b..146633e00b2 100644
--- a/pkgs/os-specific/gnu/mach/default.nix
+++ b/pkgs/os-specific/gnu/mach/default.nix
@@ -4,8 +4,8 @@
 assert (!headersOnly) -> (mig != null);
 
 let
-  date = "2010-05-12";
-  rev = "master@{${date}}";
+  date = "20100512";
+  rev = "7987a711e8f13c0543e87a0211981f4b40ef6d94";
 in
 stdenv.mkDerivation ({
   name = "gnumach${if headersOnly then "-headers" else ""}-${date}";
diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix
index 68951e84e2d..668229b101f 100644
--- a/pkgs/os-specific/gnu/mig/default.nix
+++ b/pkgs/os-specific/gnu/mig/default.nix
@@ -1,8 +1,8 @@
 { fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders }:
 
 let
-  date = "2010-05-12";
-  rev = "master@{${date}}";
+  date = "20100512";
+  rev = "4fee6a5652f609cb68cdbd9049d4da7a194f15f8";
 in
 stdenv.mkDerivation {
   name = "mig-${date}";
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index d26a0aa7fca..666f2d9475b 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -1,13 +1,13 @@
-args: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "acpi-0.09";
+  
   src = fetchurl {
     url = "http://grahame.angrygoats.net/source/acpi/${name}.tar.gz";
     sha256 = "11iwzbm3gcn9ljvxl4cjj9fc1n135hx45rhrsprnnkqppndf3vn1";
   };
 
-
   meta = {
     longDescription = ''
       Linux ACPI client is a small command-line
diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix
index 2ecb21d2b5b..06af0c9228a 100644
--- a/pkgs/os-specific/linux/afuse/default.nix
+++ b/pkgs/os-specific/linux/afuse/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, fuse }:
+
 stdenv.mkDerivation {
   name = "afuse-0.2";
 
@@ -7,18 +8,14 @@ stdenv.mkDerivation {
     sha256 = "1lj2jdks0bgwxbjqp5a9f7qdry19kar6pg7dh1ml98gapx9siylj";
   };
 
-  buildInputs = [pkgconfig fuse];
+  buildInputs = [ pkgconfig fuse ];
 
   meta = { 
-    description = "automounting in userspace. Allows easy access to ssh-agent etc";
-    longDesc = ''
-      Example: (automunt using sshfs by accessing ~/sshfs/[user@]domain
-      afuse -o mount_template="sshfs %r:/ %m" -o unmount_template="fusermount -u -z %m" ~/sshfs/
-    '';
+    description = "Automounter in userspace";
     homepage = http://sourceforge.net/projects/afuse;
     license = "GPL-v2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 
diff --git a/pkgs/os-specific/linux/atheros/0.9.3.3.nix b/pkgs/os-specific/linux/atheros/0.9.3.3.nix
deleted file mode 100644
index bfd130a7610..00000000000
--- a/pkgs/os-specific/linux/atheros/0.9.3.3.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.3.3.tar.bz2;
-			sha256 = "1dq56dx81wfhpgipbrl3gk2is3g1xvysx2pl6vxyj0dhslkcnf3y";
-		};
-
-		buildInputs = [];
-		configureFlags = [];
-		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
-		patchAR2425x86 = ""; /*(if args ? pci001c_rev01 && args.pci001c_rev01 then
-		fetchurl {
-			url = http://madwifi.org/attachment/ticket/1679/madwifi-ng-0933.ar2425.20071130.i386.patch?format=raw;
-			name = "madwifi-AR2425-x86.patch";
-			sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg";
-		} else "")*/;
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
-let 
-doPatch = fullDepEntry (if patchAR2425x86 !="" then ''
-	cd hal
-	patch -Np1 -i ${patchAR2425x86}
-'' else "") [minInit doUnpack];
-postInstall = fullDepEntry (''
-	ln -s $out/usr/local/bin $out/bin
-'') [minInit doMakeInstall];
-in
-stdenv.mkDerivation rec {
-	name = "atheros-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doPatch doMakeInstall 
-			postInstall doForceShare doPropagate]);
-	meta = {
-		description = "Atheros WiFi driver";
-		inherit src;
-	};
-}
diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix
index 780e19757b2..b139867be60 100644
--- a/pkgs/os-specific/linux/atheros/0.9.4.nix
+++ b/pkgs/os-specific/linux/atheros/0.9.4.nix
@@ -1,4 +1,4 @@
-args : with args;
+{ stdenv, fetchurl, builderDefs, kernel }:
 	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 		fetchurl {
diff --git a/pkgs/os-specific/linux/atheros/r2756.nix b/pkgs/os-specific/linux/atheros/r2756.nix
deleted file mode 100644
index 41b06e70552..00000000000
--- a/pkgs/os-specific/linux/atheros/r2756.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2756-20071018.tar.gz;
-			sha256 = "0mm1kx9pjvvla792rv7k48yhsa0fpzvd1717g9xzazjsz2mqwzyv";
-		};
-
-		buildInputs = [];
-		configureFlags = [];
-		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
-		patchAR2425x86 = (if args ? pci001c_rev01 && args.pci001c_rev01 then
-		fetchurl {
-			url = http://madwifi.org/attachment/ticket/1679/madwifi-ng-0933.ar2425.20071130.i386.patch?format=raw;
-			name = "madwifi-AR2425-x86.patch";
-			sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg";
-		} else "");
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
-let 
-doPatch = fullDepEntry (if patchAR2425x86 !="" then ''
-	cd hal
-	patch -Np1 -i ${patchAR2425x86}
-	cd ..
-'' else "") [minInit doUnpack];
-postInstall = fullDepEntry (''
-	ln -s $out/usr/local/bin $out/bin
-'') [minInit doMakeInstall];
-in
-stdenv.mkDerivation rec {
-	name = "atheros-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doPatch doMakeInstall 
-			postInstall doForceShare doPropagate]);
-	meta = {
-		description = "Atheros WiFi driver.";
-		inherit src;
-	};
-}
diff --git a/pkgs/os-specific/linux/atheros/r3122.nix b/pkgs/os-specific/linux/atheros/r3122.nix
deleted file mode 100644
index f40761770b8..00000000000
--- a/pkgs/os-specific/linux/atheros/r3122.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r3122-20080109.tar.gz;
-			sha256 = "188258c6q96n8lb57c0cqsvxp47psninirdax13w4yd07v1rymwd";
-		};
-
-		buildInputs = [];
-		configureFlags = [];
-		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
-let
-postInstall = fullDepEntry (''
-	ln -s $out/usr/local/bin $out/bin
-'') [minInit doMakeInstall];
-in
-stdenv.mkDerivation rec {
-	name = "atheros-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doMakeInstall postInstall
-			doForceShare doPropagate]);
-	meta = {
-		description = "Atheros WiFi driver";
-		inherit src;
-	};
-}
diff --git a/pkgs/os-specific/linux/atheros/r3574.nix b/pkgs/os-specific/linux/atheros/r3574.nix
deleted file mode 100644
index 7b97a235ae7..00000000000
--- a/pkgs/os-specific/linux/atheros/r3574.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-		  fetchurl {
-		    url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3574-20080426.tar.gz;
-		    sha256 = "1awr8jxrh6nvrsnyaydafkz7yarax3h4xphjcx6gmwsfbyb2mj7q";
-		  };
-
-		buildInputs = [];
-		configureFlags = [];
-		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
-let
-postInstall = fullDepEntry (''
-	ln -s $out/usr/local/bin $out/bin
-'') [minInit doMakeInstall];
-in
-stdenv.mkDerivation rec {
-	name = "atheros-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doMakeInstall postInstall
-			doForceShare doPropagate]);
-	meta = {
-		description = "Atheros WiFi driver";
-		inherit src;
-	};
-}
diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix
deleted file mode 100644
index b6144f81f8d..00000000000
--- a/pkgs/os-specific/linux/atheros/r3693.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = fetchurl {
-			url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3693-20080602.tar.gz;
-			sha256 = "0r9nnxcq50rgwcm9y93rpk3mqknl3ixkxkd72437b55qlz1f9vs3";
-		};
-
-		buildInputs = [];
-		configureFlags = [];
-		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
-		hal20080528 = fetchurl {
-		  url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz;
-		  sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9";
-		};
-	};
-	in with localDefs;
-let
-preBuild = fullDepEntry (''
-	echo Replacing HAL.
-	tar xvf ${hal20080528}
-	rm -r hal
-	mv ath_hal-* hal
-'') ["minInit" "doUnpack"];
-postInstall = fullDepEntry (''
-	ln -s $out/usr/local/bin $out/bin
-'') [minInit doMakeInstall];
-in
-stdenv.mkDerivation rec {
-	name = "atheros-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			((lib.optional 
-				(lib.attrByPath ["freshHAL"] false args)
-				preBuild)
-			++ [doMakeInstall postInstall
-			doForceShare doPropagate]));
-	meta = {
-		description = "Atheros WiFi driver";
-		inherit src;
-	};
-}
diff --git a/pkgs/os-specific/linux/atheros/r3837.nix b/pkgs/os-specific/linux/atheros/r3837.nix
deleted file mode 100644
index 39f5488ba6c..00000000000
--- a/pkgs/os-specific/linux/atheros/r3837.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = fetchurl {
-			url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz;
-			sha256 = "0yj6jxlygb5bdnysmn47dn4wi220ma310vd885a1pl7hp3ky216m";
-		};
-
-		buildInputs = [];
-		configureFlags = [];
-		makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
-		hal20080528 = fetchurl {
-		  url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz;
-		  sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9";
-		};
-		injectionPatchFile = ./inj.patch;
-	};
-	in with localDefs;
-let
-preBuild = fullDepEntry (''
-	echo Replacing HAL.
-	tar xvf ${hal20080528}
-	rm -r hal
-	mv ath_hal-* hal
-'') ["minInit" "doUnpack"];
-postInstall = fullDepEntry (''
-	ln -s $out/usr/local/bin $out/bin
-'') [minInit doMakeInstall];
-in
-stdenv.mkDerivation rec {
-	name = "atheros-"+version;
-	patches = lib.optional
-		(lib.attrByPath ["injectionPatch"] false args)
-		injectionPatchFile;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			((lib.optional 
-				(lib.attrByPath ["freshHAL"] false args)
-				preBuild)
-			++ [doPatch doMakeInstall postInstall
-			doForceShare doPropagate]));
-	meta = {
-		description = "Atheros WiFi driver";
-		inherit src;
-	};
-}
diff --git a/pkgs/os-specific/linux/aufs/default.nix b/pkgs/os-specific/linux/aufs/default.nix
index 5042dd1a55e..5321bfa3d6b 100644
--- a/pkgs/os-specific/linux/aufs/default.nix
+++ b/pkgs/os-specific/linux/aufs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernel}:
+{ stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation {
   name = "aufs-20090414-${kernel.version}";
diff --git a/pkgs/os-specific/linux/blcr/0.6.5.nix b/pkgs/os-specific/linux/blcr/0.6.5.nix
deleted file mode 100644
index 236afccf79a..00000000000
--- a/pkgs/os-specific/linux/blcr/0.6.5.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args : with args; 
-assert args ? kernel;
-rec {
-  src = fetchurl {
-    url = http://ftg.lbl.gov/CheckpointRestart/downloads/blcr-0.6.5.tar.gz ;
-    sha256 = "195gwxb38wmhzxr0jr349g6pxlwz6id2y6szv2akprv5ypy9py0g";
-  };
-
-  buildInputs = [perl];
-  configureFlags = [ 
-    "--with-linux=$(ls -d ${args.kernel}/lib/modules/*/build)" 
-    "--with-kmod-dir=$out/lib/modules/$(cd ${args.kernel}/lib/modules; ls -d 2.6.*)" 
-    "--with-system-map=${args.kernel}/System.map"
-  ];
-
-  preConfigure = fullDepEntry (''
-    sed -e 's/FASTCALL//' -i configure configure.ac
-    sed -e 's/int (attach_pid/void (attach_pid/' -i configure configure.ac
-  '')["doUnpack" "minInit"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-      
-  name = "blcr-" + version;
-  meta = {
-    description = "Berkley Labs Checkpointing/Restarting module (save process tree state)";
-  };
-}
diff --git a/pkgs/os-specific/linux/blcr/0.8.2.nix b/pkgs/os-specific/linux/blcr/0.8.2.nix
index 3217f9aec3a..d5d715c223c 100644
--- a/pkgs/os-specific/linux/blcr/0.8.2.nix
+++ b/pkgs/os-specific/linux/blcr/0.8.2.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, kernel, perl, makeWrapper}:
+{ stdenv, fetchurl, kernel, perl, makeWrapper, autoconf, automake, libtool }:
 
 assert stdenv.isLinux;
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   patches = [ ./fixes.patch ];
 
-  buildInputs = [ perl makeWrapper ];
+  buildInputs = [ perl makeWrapper autoconf automake libtool ];
 
   # this gives "configure: error: unrecognized option: `-d'"
   /*
@@ -29,6 +29,7 @@ stdenv.mkDerivation {
   */
 
   configurePhase = ''
+    autoreconf
     ./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.*) \
diff --git a/pkgs/os-specific/linux/blcr/fixes.patch b/pkgs/os-specific/linux/blcr/fixes.patch
index c7207aec896..879352d8325 100644
--- a/pkgs/os-specific/linux/blcr/fixes.patch
+++ b/pkgs/os-specific/linux/blcr/fixes.patch
@@ -1,839 +1,6 @@
-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
+diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/acinclude.m4 blcr-0.8.2/acinclude.m4
+--- blcr-0.8.2-orig/acinclude.m4	2009-06-12 22:37:01.000000000 +0200
++++ blcr-0.8.2/acinclude.m4	2010-07-29 21:18:29.000000000 +0200
 @@ -953,8 +953,9 @@
  # When complete sets LINUX_SYMTAB_CMD such that
  # "eval $LINUX_SYMTAB_CMD" will produce a System.map on stdout.
@@ -854,13171 +21,9 @@ diff -r 3c8a74e0c599 acinclude.m4
      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:
-+#
-+#    <var>='`$ECHO "X$<var>" | $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 <bug-libtool@gnu.org>."
-+
-+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 <<EOF
-+  cat <<_LT_EOF
- [$]*
--EOF
-+_LT_EOF
-   exit 0
- fi
- 
- # 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
--
--if test -z "$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 &&
--       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 <<EOF
-+  cat > 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 <<EOF 1>&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 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -2032,16 +2919,25 @@
-   AC_MSG_RESULT(no)
- fi
- test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_PROG_LD_GNU
--])# AC_PROG_LD
--
--
--# AC_PROG_LD_GNU
--# --------------
--AC_DEFUN([AC_PROG_LD_GNU],
--[AC_REQUIRE([AC_PROG_EGREP])dnl
--AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-+_LT_PATH_LD_GNU
-+AC_SUBST([LD])
-+
-+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-+])# LT_PATH_LD
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_LD], [])
-+dnl AC_DEFUN([AC_PROG_LD], [])
-+
-+
-+# _LT_PATH_LD_GNU
-+#- --------------
-+m4_defun([_LT_PATH_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -2051,14 +2947,14 @@
-   ;;
- esac])
- with_gnu_ld=$lt_cv_prog_gnu_ld
--])# AC_PROG_LD_GNU
--
--
--# AC_PROG_LD_RELOAD_FLAG
--# ----------------------
-+])# _LT_PATH_LD_GNU
-+
-+
-+# _LT_CMD_RELOAD
-+# --------------
- # find reload flag for linker
- #   -- PORTME Some linkers may need a different reload flag.
--AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+m4_defun([_LT_CMD_RELOAD],
- [AC_CACHE_CHECK([for $LD option to reload object files],
-   lt_cv_ld_reload_flag,
-   [lt_cv_ld_reload_flag='-r'])
-@@ -2068,15 +2964,28 @@
- *) reload_flag=" $reload_flag" ;;
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
--])# AC_PROG_LD_RELOAD_FLAG
--
--
--# AC_DEPLIBS_CHECK_METHOD
--# -----------------------
-+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
-+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-+_LT_DECL([], [reload_cmds], [2])dnl
-+])# _LT_CMD_RELOAD
-+
-+
-+# _LT_CHECK_MAGIC_METHOD
-+# ----------------------
- # how to check for library dependencies
- #  -- PORTME fill in with the dynamic library characteristics
--AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise dependent libraries],
-+m4_defun([_LT_CHECK_MAGIC_METHOD],
-+[m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
-+AC_CACHE_CHECK([how to recognize dependent libraries],
- lt_cv_deplibs_check_method,
- [lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -2093,7 +3002,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
-   ;;
- 
-@@ -2101,22 +3010,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'
-   ;;
- 
-@@ -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 <<EOF
--int a;
--void foo (void) { a = 0; }
--EOF
--],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
--class Foo
--{
--public:
--  Foo (void) { a = 0; }
--private:
--  int a;
--};
--EOF
--],[$1],[F77],[cat > conftest.$ac_ext <<EOF
--      subroutine foo
--      implicit none
--      integer*4 a
--      a=0
--      return
--      end
--EOF
--],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
--public class foo {
--  private int a;
--  public void bar (void) {
--    a = 0;
--  }
--};
--EOF
--])
--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
--
--  # 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
--    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_AC_TAGVAR(compiler_lib_search_path, $1)"; then
--	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
--	   else
--	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_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_AC_TAGVAR(postdeps, $1)"; then
--	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
--	 else
--	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_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_AC_TAGVAR(predep_objects, $1)"; then
--	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
--	 else
--	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
--	 fi
--       else
--	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
--	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
--	 else
--	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_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
--
--case " $_LT_AC_TAGVAR(postdeps, $1) " in
--*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
--esac
--])# AC_LIBTOOL_POSTDEP_PREDEP
--
--# AC_LIBTOOL_LANG_F77_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_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
--AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
--[AC_REQUIRE([AC_PROG_F77])
--AC_LANG_PUSH(Fortran 77)
--
--_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
--
--# Source file extension for f77 test sources.
--ac_ext=f
--
--# Object file extension for compiled f77 test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$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.
--_LT_AC_SYS_COMPILER
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${F77-"f77"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
--
--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*)
--  test "$enable_shared" = yes && enable_static=no
--  ;;
--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])
--
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--
--_LT_AC_TAGVAR(GCC, $1)="$G77"
--_LT_AC_TAGVAR(LD, $1)="$LD"
--
--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_CONFIG($1)
--
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_F77_CONFIG
--
--
--# AC_LIBTOOL_LANG_GCJ_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_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
--AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
--[AC_LANG_SAVE
--
--# Source file extension for Java test sources.
--ac_ext=java
--
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$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.
--_LT_AC_SYS_COMPILER
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--
--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)
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_GCJ_CONFIG
--
--
--# AC_LIBTOOL_LANG_RC_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the Windows resource 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_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
--AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
--[AC_LANG_SAVE
--
--# Source file extension for RC test sources.
--ac_ext=rc
--
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$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.
--_LT_AC_SYS_COMPILER
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${RC-"windres"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_RC_CONFIG
--
--
--# AC_LIBTOOL_CONFIG([TAGNAME])
--# ----------------------------
--# If TAGNAME is not passed, then 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
--# TAGNAME from the matching tagged config vars.
--AC_DEFUN([AC_LIBTOOL_CONFIG],
--[# 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 \
--    _LT_AC_TAGVAR(compiler, $1) \
--    _LT_AC_TAGVAR(CC, $1) \
--    _LT_AC_TAGVAR(LD, $1) \
--    _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_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
--    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
--    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
--    _LT_AC_TAGVAR(old_archive_cmds, $1) \
--    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
--    _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) \
--    _LT_AC_TAGVAR(archive_cmds, $1) \
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
--    _LT_AC_TAGVAR(postinstall_cmds, $1) \
--    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
--    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
--    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
--    _LT_AC_TAGVAR(no_undefined_flag, $1) \
--    _LT_AC_TAGVAR(export_symbols_cmds, $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_automatic, $1) \
--    _LT_AC_TAGVAR(module_cmds, $1) \
--    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
--    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
--    _LT_AC_TAGVAR(exclude_expsyms, $1) \
--    _LT_AC_TAGVAR(include_expsyms, $1); do
--
--    case $var in
--    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
--    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
--    _LT_AC_TAGVAR(archive_cmds, $1) | \
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
--    _LT_AC_TAGVAR(module_cmds, $1) | \
--    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
--    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
--    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
--    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
--
--ifelse([$1], [],
--  [cfgfile="${ofile}T"
--  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
--  $rm -f "$cfgfile"
--  AC_MSG_NOTICE([creating $ofile])],
--  [cfgfile="$ofile"])
--
--  cat <<__EOF__ >> "$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 <gord@gnu.ai.mit.edu>, 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 <<EOF
-+  cat > 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 <<EOF > 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 <<EOF >> 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 <<EOF 1>&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 <kc5tja@dolphin.openprojects.net> 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 <jrb3@best.com> 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 <<EOF 1>&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 <windows.h>
--# #undef WIN32_LEAN_AND_MEAN
--# #include <stdio.h>
--#
--# #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 <cygwin/cygwin_dll.h>
--# 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 <jrb3@best.com> 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 <conftest.tar])
-+    grep GrepMe conftest.dir/file >/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
+diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/blcr_imports/module.c blcr-0.8.2/blcr_imports/module.c
+--- blcr-0.8.2-orig/blcr_imports/module.c	2008-05-13 08:06:19.000000000 +0200
++++ blcr-0.8.2/blcr_imports/module.c	2010-07-29 21:18:29.000000000 +0200
 @@ -81,7 +81,13 @@
  
  	/* Check current kernel against System.map used at configure time */
@@ -14033,3218 +38,9 @@ diff -r 3c8a74e0c599 blcr_imports/module.c
  	    unsigned long offset2 = CR_EXPORTED_KCODE_register_blkdev - (unsigned long)&register_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 <per@bothner.com>.
- # Please send patches to <config-patches@gnu.org>.  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 <features.h>
--	#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' </usr/options/cb.name`
-@@ -1073,73 +1086,86 @@
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i386.
--	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        # the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/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 <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# 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 <config-patches@gnu.org>.  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 <http://www.gnu.org/licenses/>.
- 
- # 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 <bug-automake@gnu.org>.
- 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
+diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/config/kbuild.mak.in blcr-0.8.2/config/kbuild.mak.in
+--- blcr-0.8.2-orig/config/kbuild.mak.in	2008-08-04 20:39:29.000000000 +0200
++++ blcr-0.8.2/config/kbuild.mak.in	2010-07-29 21:18:29.000000000 +0200
 @@ -1,7 +1,7 @@
  # Here are the configuration bits needed in the "caller" to use this file
  #SUBDIR = vmadump4
@@ -17263,79900 +59,9 @@ diff -r 3c8a74e0c599 config/kbuild.mak.in
  # 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 <gord@gnu.ai.mit.edu>, 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 <gord@gnu.ai.mit.edu>, 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 <bug-libtool@gnu.org>.
-+
-+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 <<EOF
- $*
- EOF
--  exit 0
-+  exit $EXIT_SUCCESS
- fi
- 
--# The name of this program.
--progname=`$echo "$0" | ${SED} 's%^.*/%%'`
--modename="$progname"
--
--# Constants.
--PROGRAM=ltmain.sh
--PACKAGE=libtool
--VERSION=1.5.2
--TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08)"
--
--default_mode=
--help="Try \`$progname --help' for more information."
- magic="%%%MAGIC variable%%%"
--mkdir="mkdir"
--mv="mv -f"
--rm="rm -f"
--
--# 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'
--# test EBCDIC or ASCII
--case `echo A|tr A '\301'` in
-- A) # EBCDIC based system
--  SP2NL="tr '\100' '\n'"
--  NL2SP="tr '\r\n' '\100\100'"
--  ;;
-- *) # Assume ASCII based system
--  SP2NL="tr '\040' '\012'"
--  NL2SP="tr '\015\012' '\040\040'"
--  ;;
--esac
--
--# NLS nuisances.
--# 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).
--# We save the old values to restore during execute mode.
--if test "${LC_ALL+set}" = set; then
--  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
--fi
--if test "${LANG+set}" = set; then
--  save_LANG="$LANG"; LANG=C; export LANG
--fi
--
--# Make sure IFS has a sensible default
--: ${IFS=" 	
--"}
--
--if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
--  $echo "$modename: not configured to build any kind of library" 1>&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 <<EOF
-+# $write_libobj - a libtool object file
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# Name of the PIC object.
-+pic_object=$write_lobj
-+
-+# Name of the non-PIC object
-+non_pic_object=$write_oldobj
-+
-+EOF
-+      $MV "${write_libobj}T" "${write_libobj}"
-+    }
-+}
-+
-+# func_mode_compile arg...
-+func_mode_compile ()
-+{
-+    $opt_debug
-+    # 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=
-+    pie_flag=
-+
-+    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)
-+	  test -n "$libobj" && \
-+	    func_fatal_error "you cannot specify \`-o' more than once"
-+	  arg_mode=target
-+	  continue
-+	  ;;
-+
-+	-pie | -fpie | -fPIE)
-+          pie_flag="$pie_flag $arg"
-+	  continue
-+	  ;;
-+
-+	-shared | -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,*)
-+	  func_stripname '-Wc,' '' "$arg"
-+	  args=$func_stripname_result
-+	  lastarg=
-+	  save_ifs="$IFS"; IFS=','
-+	  for arg in $args; do
-+	    IFS="$save_ifs"
-+	    func_quote_for_eval "$arg"
-+	    lastarg="$lastarg $func_quote_for_eval_result"
-+	  done
-+	  IFS="$save_ifs"
-+	  func_stripname ' ' '' "$lastarg"
-+	  lastarg=$func_stripname_result
-+
-+	  # 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.
-+      func_quote_for_eval "$lastarg"
-+      base_compile="$base_compile $func_quote_for_eval_result"
-+    done # for arg
-+
-+    case $arg_mode in
-+    arg)
-+      func_fatal_error "you must specify an argument for -Xcompile"
-+      ;;
-+    target)
-+      func_fatal_error "you must specify a target with \`-o'"
-+      ;;
-+    *)
-+      # Get the name of the library object.
-+      test -z "$libobj" && {
-+	func_basename "$srcfile"
-+	libobj="$func_basename_result"
-+      }
-+      ;;
-+    esac
-+
-+    # Recognize several different file suffixes.
-+    # If the user specifies -o file.o, it is replaced with file.lo
-+    case $libobj in
-+    *.[cCFSifmso] | \
-+    *.ada | *.adb | *.ads | *.asm | \
-+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-+      func_xform "$libobj"
-+      libobj=$func_xform_result
-+      ;;
-+    esac
-+
-+    case $libobj in
-+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-+    *)
-+      func_fatal_error "cannot determine name of library object from \`$libobj'"
-+      ;;
-+    esac
-+
-+    func_infer_tag $base_compile
- 
-     for arg in $later; do
-       case $arg in
-+      -shared)
-+	test "$build_libtool_libs" != yes && \
-+	  func_fatal_configuration "can not build a shared library"
-+	build_old_libs=no
-+	continue
-+	;;
-+
-       -static)
-+	build_libtool_libs=no
- 	build_old_libs=yes
- 	continue
- 	;;
-@@ -577,20 +1255,17 @@
-       esac
-     done
- 
--    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
--    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
--    if test "X$xdir" = "X$obj"; then
--      xdir=
--    else
--      xdir=$xdir/
--    fi
-+    func_quote_for_eval "$libobj"
-+    test "X$libobj" != "X$func_quote_for_eval_result" \
-+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-+      && 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 <<EOF
--# $libobj - a libtool object file
--# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
--#
--# Please DO NOT delete this file!
--# It is necessary for linking the library.
--
--# Name of the PIC object.
--EOF
-+    func_quote_for_eval "$srcfile"
-+    qsrcfile=$func_quote_for_eval_result
- 
-     # Only build a PIC object if we are building libtool libraries.
-     if test "$build_libtool_libs" = yes; then
-@@ -676,38 +1339,25 @@
-       fbsd_hideous_sh_bug=$base_compile
- 
-       if test "$pic_mode" != no; then
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       else
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile"
-       fi
- 
--      if test ! -d "${xdir}$objdir"; then
--	$show "$mkdir ${xdir}$objdir"
--	$run $mkdir ${xdir}$objdir
--	status=$?
--	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
--	  exit $status
--	fi
--      fi
-+      func_mkdir_p "$xdir$objdir"
- 
-       if test -z "$output_obj"; then
- 	# Place PIC objects in $objdir
- 	command="$command -o $lobj"
-       fi
- 
--      $run $rm "$lobj" "$output_obj"
--
--      $show "$command"
--      if $run eval "$command"; then :
--      else
--	test -n "$output_obj" && $run $rm $removelist
--	exit 1
--      fi
-+      func_show_eval_locale "$command"	\
-+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- 
-       if test "$need_locks" = warn &&
- 	 test "X`cat $lockfile 2>/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 <<EOF
--pic_object='$objdir/$objname'
--
--EOF
--
-       # Allow error messages only from the first compilation.
-       if test "$suppress_opt" = yes; then
--        suppress_output=' >/dev/null 2>&1'
-+	suppress_output=' >/dev/null 2>&1'
-       fi
--    else
--      # No PIC object so indicate it doesn't exist in the libtool
--      # object file.
--      test -z "$run" && cat >> ${libobj}T <<EOF
--pic_object=none
--
--EOF
-     fi
- 
-     # Only build a position-dependent object if we build old libraries.
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
- 	# Don't build PIC code
--	command="$base_compile $srcfile"
-+	command="$base_compile $qsrcfile$pie_flag"
-       else
--	command="$base_compile $srcfile $pic_flag"
-+	command="$base_compile $qsrcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
- 	command="$command -o $obj"
-@@ -769,17 +1401,12 @@
- 
-       # Suppress compiler output if we already did a PIC compilation.
-       command="$command$suppress_output"
--      $run $rm "$obj" "$output_obj"
--      $show "$command"
--      if $run eval "$command"; then :
--      else
--	$run $rm $removelist
--	exit 1
--      fi
-+      func_show_eval_locale "$command" \
-+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- 
-       if test "$need_locks" = warn &&
- 	 test "X`cat $lockfile 2>/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 >/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 <<EOF
--# Name of the non-PIC object.
--non_pic_object='$objname'
--
-+
-+	$ECHO "\
-+
-+  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 "\
-+    # 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 "\
-+    # Add the dll search path components to the executable PATH
-+    PATH=$dllsearchpath:\$PATH
-+"
-+	fi
-+
-+	$ECHO "\
-+    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* | *-cegcc*)
-+	  $ECHO "\
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
-+	  ;;
-+
-+	*)
-+	  $ECHO "\
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
-+	  ;;
-+	esac
-+	$ECHO "\
-+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&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 <<EOF
-+
-+/* $cwrappersource - temporary wrapper executable 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 executable should never be moved out of the build directory.
-+   If it is, it will not operate correctly.
-+
-+   Currently, it simply execs the wrapper *script* "$SHELL $output",
-+   but could eventually absorb all of the scripts functionality and
-+   exec $objdir/$outputname directly.
-+*/
- EOF
--    else
--      # 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 <<EOF
--# Name of the non-PIC object.
--non_pic_object=none
--
-+	    cat <<"EOF"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#ifdef _MSC_VER
-+# include <direct.h>
-+# include <process.h>
-+# include <io.h>
-+# define setmode _setmode
-+#else
-+# include <unistd.h>
-+# include <stdint.h>
-+# ifdef __CYGWIN__
-+#  include <io.h>
-+#  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 <malloc.h>
-+#include <stdarg.h>
-+#include <assert.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+
-+#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 <<EOF
-+
-+static const char *script_text_part2 =
-+EOF
-+	    func_emit_wrapper_part2 yes |
-+	        $SED -e 's/\([\\"]\)/\\\1/g' \
-+	             -e 's/^/  "/' -e 's/$/\\n"/'
-+	    echo ";"
-+
-+	    cat <<EOF
-+const char * MAGIC_EXE = "$magic_exe";
-+const char * LIB_PATH_VARNAME = "$shlibpath_var";
-+EOF
-+
-+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-+              func_to_host_pathlist "$temp_rpath"
-+	      cat <<EOF
-+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
-+EOF
-+	    else
-+	      cat <<"EOF"
-+const char * LIB_PATH_VALUE   = "";
-+EOF
-+	    fi
-+
-+	    if test -n "$dllsearchpath"; then
-+              func_to_host_pathlist "$dllsearchpath:"
-+	      cat <<EOF
-+const char * EXE_PATH_VARNAME = "PATH";
-+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-+EOF
-+	    else
-+	      cat <<"EOF"
-+const char * EXE_PATH_VARNAME = "";
-+const char * EXE_PATH_VALUE   = "";
-+EOF
-+	    fi
-+
-+	    if test "$fast_install" = yes; then
-+	      cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-+EOF
-+	    else
-+	      cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-+EOF
-+	    fi
-+
-+
-+	    cat <<"EOF"
-+
-+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
-+
-+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
-+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-+
-+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-+
-+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-+
-+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-+
-+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
-+
-+int
-+main (int argc, char *argv[])
-+{
-+  char **newargz;
-+  int  newargc;
-+  char *tmp_pathspec;
-+  char *actual_cwrapper_path;
-+  char *actual_cwrapper_name;
-+  char *target_name;
-+  char *lt_argv_zero;
-+  intptr_t rval = 127;
-+
-+  int i;
-+
-+  program_name = (char *) xstrdup (base_name (argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
-+
-+  /* very simple arg parsing; don't want to rely on getopt */
-+  for (i = 1; i < argc; i++)
-+    {
-+      if (strcmp (argv[i], dumpscript_opt) == 0)
-+	{
-+EOF
-+	    case "$host" in
-+	      *mingw* | *cygwin* )
-+		# make stdout use "unix" line endings
-+		echo "          setmode(1,_O_BINARY);"
-+		;;
-+	      esac
-+
-+	    cat <<"EOF"
-+	  printf ("%s", script_text_part1);
-+	  printf ("%s", script_text_part2);
-+	  return 0;
-+	}
-+    }
-+
-+  newargz = XMALLOC (char *, argc + 1);
-+  tmp_pathspec = find_executable (argv[0]);
-+  if (tmp_pathspec == NULL)
-+    lt_fatal ("Couldn't find %s", argv[0]);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-+			  tmp_pathspec));
-+
-+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-+			  actual_cwrapper_path));
-+  XFREE (tmp_pathspec);
-+
-+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-+
-+  /* wrapper name transforms */
-+  strendzap (actual_cwrapper_name, ".exe");
-+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-+  XFREE (actual_cwrapper_name);
-+  actual_cwrapper_name = tmp_pathspec;
-+  tmp_pathspec = 0;
-+
-+  /* target_name transforms -- use actual target program name; might have lt- prefix */
-+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-+  strendzap (target_name, ".exe");
-+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-+  XFREE (target_name);
-+  target_name = tmp_pathspec;
-+  tmp_pathspec = 0;
-+
-+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-+			  target_name));
-+EOF
-+
-+	    cat <<EOF
-+  newargz[0] =
-+    XMALLOC (char, (strlen (actual_cwrapper_path) +
-+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-+  strcpy (newargz[0], actual_cwrapper_path);
-+  strcat (newargz[0], "$objdir");
-+  strcat (newargz[0], "/");
-+EOF
-+
-+	    cat <<"EOF"
-+  /* stop here, and copy so we don't have to do this twice */
-+  tmp_pathspec = xstrdup (newargz[0]);
-+
-+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-+  strcat (newargz[0], actual_cwrapper_name);
-+
-+  /* DO want the lt- prefix here if it exists, so use target_name */
-+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-+  XFREE (tmp_pathspec);
-+  tmp_pathspec = NULL;
-+EOF
-+
-+	    case $host_os in
-+	      mingw*)
-+	    cat <<"EOF"
-+  {
-+    char* p;
-+    while ((p = strchr (newargz[0], '\\')) != NULL)
-+      {
-+	*p = '/';
-+      }
-+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-+      {
-+	*p = '/';
-+      }
-+  }
-+EOF
-+	    ;;
-+	    esac
-+
-+	    cat <<"EOF"
-+  XFREE (target_name);
-+  XFREE (actual_cwrapper_path);
-+  XFREE (actual_cwrapper_name);
-+
-+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-+
-+  newargc=0;
-+  for (i = 1; i < argc; i++)
-+    {
-+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-+        {
-+          if (argv[i][env_set_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_set_opt_len + 1;
-+              lt_opt_process_env_set (p);
-+            }
-+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_set (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_set_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-+        {
-+          if (argv[i][env_prepend_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_prepend_opt_len + 1;
-+              lt_opt_process_env_prepend (p);
-+            }
-+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_prepend_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-+        {
-+          if (argv[i][env_append_opt_len] == '=')
-+            {
-+              const char *p = argv[i] + env_append_opt_len + 1;
-+              lt_opt_process_env_append (p);
-+            }
-+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-+            {
-+              lt_opt_process_env_append (argv[++i]); /* don't copy */
-+            }
-+          else
-+            lt_fatal ("%s missing required argument", env_append_opt);
-+          continue;
-+        }
-+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-+        {
-+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-+             namespace, but it is not one of the ones we know about and
-+             have already dealt with, above (inluding dump-script), then
-+             report an error. Otherwise, targets might begin to believe
-+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-+             namespace. The first time any user complains about this, we'll
-+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-+             or a configure.ac-settable value.
-+           */
-+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-+                    ltwrapper_option_prefix, argv[i]);
-+        }
-+      /* otherwise ... */
-+      newargz[++newargc] = xstrdup (argv[i]);
-+    }
-+  newargz[++newargc] = NULL;
-+
-+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-+  for (i = 0; i < newargc; i++)
-+    {
-+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-+    }
-+
-+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 : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-+  {
-+#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 : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-+
-+  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 : "<NULL>"),
-+                          (value ? value : "<NULL>")));
-+
-+  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 <<EOF
- 	  int main() { return 0; }
- EOF
--	  $rm conftest
--	  $LTCC -o conftest conftest.c $deplibs
--	  if test "$?" -eq 0 ; then
-+	  $opt_dry_run || $RM conftest
-+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
- 	    ldd_output=`ldd conftest`
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
--	      # If $name is empty we are operating on a -L argument.
--              if test "$name" != "" && test "$name" -ne "0"; then
-+	      case $i in
-+	      -l*)
-+		func_stripname -l '' "$i"
-+		name=$func_stripname_result
- 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		  case " $predeps $postdeps " in
- 		  *" $i "*)
-@@ -3235,40 +6558,41 @@
- 		    i=""
- 		    ;;
- 		  esac
--	        fi
-+		fi
- 		if test -n "$i" ; then
--		  libname=`eval \\$echo \"$libname_spec\"`
--		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
--		  set dummy $deplib_matches
--		  deplib_match=$2
-+		  libname=`eval "\\$ECHO \"$libname_spec\""`
-+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-+		  set dummy $deplib_matches; shift
-+		  deplib_match=$1
- 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- 		    newdeplibs="$newdeplibs $i"
- 		  else
- 		    droppeddeps=yes
--		    $echo
--		    $echo "*** Warning: dynamic linker does not accept needed library $i."
--		    $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 I believe you do not have"
--		    $echo "*** because a test_compile did reveal that the linker did not use it for"
--		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-+		    $ECHO
-+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-+		    $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 I believe you do not have"
-+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
- 		  fi
- 		fi
--	      else
-+		;;
-+	      *)
- 		newdeplibs="$newdeplibs $i"
--	      fi
-+		;;
-+	      esac
- 	    done
- 	  else
- 	    # Error occurred in the first compile.  Let's try to salvage
- 	    # the situation: Compile a separate program for each library.
- 	    for i in $deplibs; do
--	      name="`expr $i : '-l\(.*\)'`"
--	      # If $name is empty we are operating on a -L argument.
--              if test "$name" != "" && test "$name" != "0"; then
--		$rm conftest
--		$LTCC -o conftest conftest.c $i
--		# Did it work?
--		if test "$?" -eq 0 ; then
-+	      case $i in
-+	      -l*)
-+		func_stripname -l '' "$i"
-+		name=$func_stripname_result
-+		$opt_dry_run || $RM conftest
-+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
- 		  ldd_output=`ldd conftest`
- 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 		    case " $predeps $postdeps " in
-@@ -3279,44 +6603,47 @@
- 		    esac
- 		  fi
- 		  if test -n "$i" ; then
--		    libname=`eval \\$echo \"$libname_spec\"`
--		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
--		    set dummy $deplib_matches
--		    deplib_match=$2
-+		    libname=`eval "\\$ECHO \"$libname_spec\""`
-+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-+		    set dummy $deplib_matches; shift
-+		    deplib_match=$1
- 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- 		      newdeplibs="$newdeplibs $i"
- 		    else
- 		      droppeddeps=yes
--		      $echo
--		      $echo "*** Warning: dynamic linker does not accept needed library $i."
--		      $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 a test_compile did reveal that the linker did not use this one"
--		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-+		      $ECHO
-+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-+		      $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 a test_compile did reveal that the linker did not use this one"
-+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
- 		    fi
- 		  fi
- 		else
- 		  droppeddeps=yes
--		  $echo
--		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
--		  $echo "***  make it link in!  You will probably need to install it or some"
--		  $echo "*** library that it depends on before this library will be fully"
--		  $echo "*** functional.  Installing it before continuing would be even better."
-+		  $ECHO
-+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-+		  $ECHO "*** make it link in!  You will probably need to install it or some"
-+		  $ECHO "*** library that it depends on before this library will be fully"
-+		  $ECHO "*** functional.  Installing it before continuing would be even better."
- 		fi
--	      else
-+		;;
-+	      *)
- 		newdeplibs="$newdeplibs $i"
--	      fi
-+		;;
-+	      esac
- 	    done
- 	  fi
- 	  ;;
- 	file_magic*)
--	  set dummy $deplibs_check_method
--	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+	  set dummy $deplibs_check_method; shift
-+	  file_magic_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 "$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 "*)
-@@ -3326,13 +6653,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
- 		      # 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 >/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 <<EOF
--
--/* $cwrappersource - temporary wrapper executable 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 executable should never be moved out of the build directory.
--   If it is, it will not operate correctly.
--
--   Currently, it simply execs the wrapper *script* "/bin/sh $output",
--   but could eventually absorb all of the scripts functionality and
--   exec $objdir/$outputname directly.
--*/
--EOF
--	    cat >> $cwrappersource<<"EOF"
--#include <stdio.h>
--#include <stdlib.h>
--#include <unistd.h>
--#include <malloc.h>
--#include <stdarg.h>
--#include <assert.h>
--
--#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 <<EOF
--  newargz[0] = "$SHELL";
--EOF
--
--	    cat >> $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 <<EOF
--  execv("$SHELL",newargz);
--EOF
--
--	    cat >> $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 <bug-libtool@gnu.org>."
--  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 <pinard@iro.umontreal.ca>, 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 <http://www.gnu.org/licenses/>.
- 
- # 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 <bug-automake@gnu.org>."
-+    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 <http://ftg.lbl.gov/checkpoint>.
- #
--# 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 <<EOF
-+  cat <<_LT_EOF
- $*
--EOF
-+_LT_EOF
-   exit 0
- fi
- 
- # 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
--
--if test -z "$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 &&
--       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 </dev/null
-+exec 6>&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 <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- #  include <stdlib.h>
- # 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 <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--#  include <stdint.h>
--# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #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<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
--  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
--              headers in a nonstandard directory <include dir>
-+  LIBS        libraries to pass to the linker, e.g. -l<library>
-+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
-   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 <http://ftg.lbl.gov/checkpoint>.
- _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 <limits.h> declares $2.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $2 innocuous_$2
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $2 (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#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 <stdio.h>
-+#include <stdlib.h>
-+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 <conftest.val; ac_retval=0
-+else
-+  ac_retval=1
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+rm -f conftest.val
-+
-+  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_compute_int
-+cat >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 </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&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 </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&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 <stdio.h>
-+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 <stdarg.h>
- #include <stdio.h>
-@@ -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 <stdlib.h>
--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 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -4373,21 +5708,19 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&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 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -4397,77 +5730,540 @@
-   ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&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 @@
-   # <limits.h> 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 <limits.h>
-@@ -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 <ac_nonexistent.h>
- _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 @@
-   # <limits.h> 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 <limits.h>
-@@ -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 <ac_nonexistent.h>
- _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 <stdlib.h>
- #include <stdarg.h>
-@@ -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 <string.h>
- 
- _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 <stdlib.h>
- 
- _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 <ctype.h>
-+#include <stdlib.h>
- #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 </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&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 <stdlib.h>
--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 <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> 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 <limits.h>
--#else
--# include <assert.h>
--#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 <ac_nonexistent.h>
--_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 <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> 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 <limits.h>
--#else
--# include <assert.h>
--#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 <ac_nonexistent.h>
--_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 </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&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 <<EOF
--#ifdef __cplusplus
--extern "C" {
--#endif
--char nm_test_var;
--void nm_test_func(){}
--#ifdef __cplusplus
--}
--#endif
--int main(){nm_test_var='a';nm_test_func();return(0);}
--EOF
--
--  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); }; 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 <<EOF > 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 <<EOF >> 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 <<EOF 1>&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 <<EOF 1>&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 <<EOF 1>&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 <kc5tja@dolphin.openprojects.net> 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 <jrb3@best.com> 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 <<EOF 1>&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 <limits.h> declares shl_load.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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 <limits.h> declares dlopen.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char dlopen (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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 <<EOF
--#line 9775 "configure"
-+  cat > 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 <<EOF
--#line 9873 "configure"
-+  cat > 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 <gord@gnu.ai.mit.edu>, 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 <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* 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 <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> 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 <limits.h>
-+#else
-+# include <assert.h>
-+#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 <ac_nonexistent.h>
-+_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 <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> 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 <limits.h>
-+#else
-+# include <assert.h>
-+#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 <ac_nonexistent.h>
-+_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 </dev/null` in
-       *GNU* | *'with BFD'*)
-@@ -10751,21 +14250,19 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&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 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-@@ -10775,894 +14272,993 @@
-   ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&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 <jrb3@best.com> 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 <<EOF
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
-+    esac
-+
-+    { $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
-+
-+    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 <limits.h> declares shl_load.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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 <limits.h> declares dlopen.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char dlopen (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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 <<EOF
--#line 13473 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#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 <<EOF
--#line 13571 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#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 <<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.
--*** 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 <kc5tja@dolphin.openprojects.net> 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 <jrb3@best.com> 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 <<EOF 1>&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<name>.so
--      # instead of lib<name>.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 <<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.
--*** 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 <kc5tja@dolphin.openprojects.net> 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 <jrb3@best.com> 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 <<EOF 1>&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<name>.so
--      # instead of lib<name>.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 <limits.h> declares shl_load.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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 <limits.h> declares dlopen.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char dlopen (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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 <<EOF
--#line 18969 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#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 <<EOF
--#line 19067 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#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 </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&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 <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* 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 <stdlib.h>
--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 <stdio.h>
--#include <stdlib.h>
--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 <features.h>
-@@ -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 <sys/types.h>
-@@ -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 <sys/types.h>
-@@ -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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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 <sys/prctl.h>
-@@ -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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--long longval () { return CR_OP_HAND_CHKPT; }
--unsigned long ulongval () { return CR_OP_HAND_CHKPT; }
--#include <stdio.h>
--#include <stdlib.h>
--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 <sys/ioctl.h>
-+	 #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 <stdio.h>
--#include <stdlib.h>
--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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #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 <sys/ioctl.h>
--	 #include "blcr_ioctl.h"
--long longval () { return CR_OP_HAND_ABORT; }
--unsigned long ulongval () { return CR_OP_HAND_ABORT; }
--#include <stdio.h>
--#include <stdlib.h>
--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 <sys/ioctl.h>
-+	 #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 <stdio.h>
--#include <stdlib.h>
--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 <signal.h>
-+    if ac_fn_c_compute_int "$LINENO" "offsetof(struct siginfo, si_pid)" "cr_cv_compute_int_CR_ASM_SI_PID_OFFSET"        "#include <signal.h>
- 	 #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 <signal.h>
--	 #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 <signal.h>
--	 #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 <signal.h>
--	 #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 <signal.h>
--	 #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 <signal.h>
--	 #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 <stdio.h>
--#include <stdlib.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--long longval () { return __NR_ioctl; }
--unsigned long ulongval () { return __NR_ioctl; }
--#include <stdio.h>
--#include <stdlib.h>
--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 <asm/unistd.h>
-+	 #include <linux/unistd.h>"; 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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--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 <asm/unistd.h>
--	 #include <linux/unistd.h>
--long longval () { return __NR_rt_sigreturn; }
--unsigned long ulongval () { return __NR_rt_sigreturn; }
--#include <stdio.h>
--#include <stdlib.h>
--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 <asm/unistd.h>
-+	 #include <linux/unistd.h>"; 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 <libftb.h>
-@@ -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 <libftb.h>
-@@ -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 <stdio.h>
- 	#include <dlfcn.h>
-@@ -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 <stdio.h>
--#include <stdlib.h>
--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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-+		 #ifndef FASTCALL
-+		   #define FASTCALL(_decl) _decl
-+		 #endif
-+		 #include <linux/types.h>
-+
-+		#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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -45303,7 +33130,7 @@
- 		 #include <linux/slab.h>
- _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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <linux/kernel.h>
-@@ -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 <bug-autoconf@gnu.org>."
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
-+Report bugs to <http://ftg.lbl.gov/checkpoint>."
-+
-+_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 2>/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 2>/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
-+' <conf$$subs.awk | sed '
-+/^[^""]/{
-+  N
-+  s/\n//
-+}
-+' >>$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
-+' <confdefs.h | sed '
-+s/'"$ac_delim"'/"\\\
-+"/g' >>$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 <<CEOF' >>$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 <<CEOF' >>$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
+diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/configure.ac blcr-0.8.2/configure.ac
+--- blcr-0.8.2-orig/configure.ac	2009-06-16 00:33:56.000000000 +0200
++++ blcr-0.8.2/configure.ac	2010-07-29 21:18:29.000000000 +0200
 @@ -123,6 +123,8 @@
  AC_CONFIG_AUX_DIR(./config)
  AM_INIT_AUTOMAKE([foreign no-exeext std-options])
@@ -97267,1187 +172,9 @@ diff -r 3c8a74e0c599 configure.ac
  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
+diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/cr_module/cr_kcompat.h blcr-0.8.2/cr_module/cr_kcompat.h
+--- blcr-0.8.2-orig/cr_module/cr_kcompat.h	2009-06-12 22:37:03.000000000 +0200
++++ blcr-0.8.2/cr_module/cr_kcompat.h	2010-07-29 21:18:29.000000000 +0200
 @@ -274,7 +274,8 @@
  #elif HAVE_2_ARG_FIND_PID
    #define cr_have_pid(T,P) (find_pid((T),(P)) != NULL)
@@ -98468,5869 +195,28 @@ diff -r 3c8a74e0c599 cr_module/cr_kcompat.h
 +#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
+diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/cr_module/Makefile.am blcr-0.8.2/cr_module/Makefile.am
+--- blcr-0.8.2-orig/cr_module/Makefile.am	2008-09-03 02:29:00.000000000 +0200
++++ blcr-0.8.2/cr_module/Makefile.am	2010-07-29 21:18:29.000000000 +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)'
  
-@@ -508,6 +537,7 @@
+ 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)
  
- 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
+ # echo an arbitrary make/environment variable (needed by kbuild glue)
+diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/include/blcr_ksyms.h blcr-0.8.2/include/blcr_ksyms.h
+--- blcr-0.8.2-orig/include/blcr_ksyms.h	2008-12-02 01:17:42.000000000 +0100
++++ blcr-0.8.2/include/blcr_ksyms.h	2010-07-29 21:18:29.000000000 +0200
 @@ -55,7 +55,11 @@
  
  #if defined(__i386__) || defined(__x86_64__)
@@ -104344,1233 +230,9 @@ diff -r 3c8a74e0c599 include/blcr_ksyms.h
    #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
+diff -ru -x Makefile.in -x aclocal.m4 -x configure -x '*config.h.in' -x 'config.*' -x depcomp -x install-sh -x ltmain.sh -x missing blcr-0.8.2-orig/libcr/arch/arm/cr_atomic.h blcr-0.8.2/libcr/arch/arm/cr_atomic.h
+--- blcr-0.8.2-orig/libcr/arch/arm/cr_atomic.h	2008-09-05 05:55:11.000000000 +0200
++++ blcr-0.8.2/libcr/arch/arm/cr_atomic.h	2010-07-29 21:18:29.000000000 +0200
 @@ -33,6 +33,25 @@
  #ifndef _CR_ATOMIC_H
  #define _CR_ATOMIC_H	1
@@ -105640,6732 +302,3 @@ diff -r 3c8a74e0c599 libcr/arch/arm/cr_atomic.h
  	"       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 </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&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 </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&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 </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&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 </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&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 </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&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 </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&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 </dev/null \
- 		 && test -n "`cat c$${pid}_.out`" \
- 		 && test -z "`cat c$${pid}_.err`"; then :; \
- 	    else echo "$$f does not support $$opt" 1>&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/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index e125d273822..2868a70e8b6 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
    
 stdenv.mkDerivation rec {
-  name = "bluez-4.65";
+  name = "bluez-4.69";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
-    sha256 = "08j9h2cm0d4ifq8jna9lgfg37b3bncmjgxm9nirdrsr6505542sz";
+    sha256 = "1h4fp6l1sflc0l5vg90hzvgldlwv7rqc4cbn2z6axmxv969pmrhh";
   };
 
   buildInputs = [ pkgconfig dbus.libs glib libusb alsaLib ];
diff --git a/pkgs/os-specific/linux/bridge_utils/default.nix b/pkgs/os-specific/linux/bridge_utils/default.nix
index b4f5efce22f..cb8b033c1e3 100644
--- a/pkgs/os-specific/linux/bridge_utils/default.nix
+++ b/pkgs/os-specific/linux/bridge_utils/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, autoconf, automake }:
+
 stdenv.mkDerivation {
   name = "bridge-utils-1.2";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0jg3z51c2c34byg4zi39j9g4b66js5kanjhid77hpa0jdfmryfy9";
   };
 
-  buildInputs = [autoconf automake];
+  buildInputs = [ autoconf automake ];
 
-  preConfigure="autoreconf";
+  preConfigure = "autoreconf";
 
   meta = { 
-      description = "http://sourceforge.net/projects/bridge/";
-      homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ];
-      license = "GPL";
+    description = "http://sourceforge.net/projects/bridge/";
+    homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ];
+    license = "GPL";
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/rt2870/default.nix b/pkgs/os-specific/linux/firmware/rt2870/default.nix
new file mode 100644
index 00000000000..388d3a50343
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/rt2870/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "rt2870-fw-22";
+  src = fetchurl {
+    url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1ERXdMekF6THpNeEwyUnZkMjVzYjJGa01UWXpPRGs1T0Rnek5pNTZhWEE5UFQxU1ZESTROekJmUm1seWJYZGhjbVZmVmpJeUM%3D";
+    name = "RT2870_Firmware_V22.zip";
+    sha256 = "d24591a8529b0a609cc3c626ecee96484bb29b2c020260b82f6025459c11f263";
+  };
+
+  buildInputs = [ unzip ];
+  
+  buildPhase = "true";
+
+  # Installation copies the firmware AND the license.  The license
+  # says: "Your rights to redistribute the Software shall be
+  # contingent upon your installation of this Agreement in its
+  # entirety in the same directory as the Software."
+  installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}";
+  
+  meta = {
+    description = "Firmware for the Ralink RT2870 wireless cards";
+    homepage = http://www.ralinktech.com/;
+    license = "non-free";
+  };
+}
diff --git a/pkgs/os-specific/linux/firmware/rt73/default.nix b/pkgs/os-specific/linux/firmware/rt73/default.nix
index ea266ea0591..32c097a62df 100644
--- a/pkgs/os-specific/linux/firmware/rt73/default.nix
+++ b/pkgs/os-specific/linux/firmware/rt73/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, unzip}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "rt73-fw-1.8";
   src = fetchurl {
     url = "http://www.ralinktech.com/download.php?t=U0wyRnpjMlYwY3k4eU1EQTVMekF6THpNeEwyUnZkMjVzYjJGa056YzVPVE13TmpZMk9TNTZhWEE5UFQxU1ZEY3hWMTlHYVhKdGQyRnlaVjlXTVM0NEM%3D";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   # says: "Your rights to redistribute the Software shall be
   # contingent upon your installation of this Agreement in its
   # entirety in the same directory as the Software."
-  installPhase = "ensureDir $out; cp * $out";
+  installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}";
   
   meta = {
     description = "Firmware for the Ralink RT73 wireless card";
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix
index 1cffb504322..dfc384b7adb 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@@ -1,9 +1,11 @@
-args: with args;
-stdenv.mkDerivation ( rec {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
   pname = "zd1211-firmware";
   version = "1.4";
 
   name = "${pname}-${version}";
+  
   src = fetchurl {
     url = "http://surfnet.dl.sourceforge.net/sourceforge/zd1211/${name}.tar.bz2";
     sha256 = "866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1";
@@ -18,4 +20,4 @@ stdenv.mkDerivation ( rec {
     homepage = http://sourceforge.net/projects/zd1211/;
     license = "GPL";
   };
-})
+}
diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix
index 521992dae17..2f830ab0131 100644
--- a/pkgs/os-specific/linux/hal/default.nix
+++ b/pkgs/os-specific/linux/hal/default.nix
@@ -8,11 +8,11 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  name = "hal-0.5.13";
+  name = "hal-0.5.14";
 
   src = fetchurl {
     url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1by8z7vy1c1m3iyh57rlqx6rah5gj6kx3ba30s9305bnffij5kzb";
+    sha256 = "00ld3afcbh4ckb8sli63mm2w69zh6ip4axhy1lxyybgiabxaqfij";
   };
 
   buildInputs = [
diff --git a/pkgs/os-specific/linux/hal/hal-evt.nix b/pkgs/os-specific/linux/hal/hal-evt.nix
index 25b4e503326..a49f4fcc0f8 100644
--- a/pkgs/os-specific/linux/hal/hal-evt.nix
+++ b/pkgs/os-specific/linux/hal/hal-evt.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libxml2, pkgconfig, boolstuff, hal, dbus_glib }:
+
 stdenv.mkDerivation {
   name = "hal-evt-0.1.4";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "173dphyzpicjz5pnw0d6wmibvib5h99nh1gmyvcqpgvf8la5vrps";
   };
 
-  buildInputs = [libxml2 pkgconfig boolstuff hal dbus_glib];
+  buildInputs = [ libxml2 pkgconfig boolstuff hal dbus_glib ];
 
   meta = { 
-    description = "execute commands on hal events";
+    description = "Execute commands on hal events";
     homepage = http://www.nongnu.org/halevt/;
     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/os-specific/linux/hal/info.nix b/pkgs/os-specific/linux/hal/info.nix
index 92677e3edae..1a4e41c776f 100644
--- a/pkgs/os-specific/linux/hal/info.nix
+++ b/pkgs/os-specific/linux/hal/info.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "hal-info-20090716";
+  name = "hal-info-20091130";
   
   src = fetchurl {
     url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "179m2ip79jpr1mrmbcm2nx7l1mjlwcfmlw4ycd4dh0jrib64m3sp";
+    sha256 = "092jhzpxa2h8djf8pijql92m70q87yds22686ryrfna3xbm90niv";
   };
 
   meta = {
diff --git a/pkgs/applications/misc/i810/default.nix b/pkgs/os-specific/linux/i810switch/default.nix
index 9407b8137d1..63a056712ac 100644
--- a/pkgs/applications/misc/i810/default.nix
+++ b/pkgs/os-specific/linux/i810switch/default.nix
@@ -1,4 +1,6 @@
-args: with args; stdenv.mkDerivation {
+{ stdenv, fetchurl, pciutils }:
+
+stdenv.mkDerivation {
   name = "i810switch-0.6.5";
 
   phases = "unpackPhase installPhase";
@@ -10,15 +12,13 @@ args: with args; stdenv.mkDerivation {
     make install DESTDIR=\${out}
   ";
 
-  inherit pciutils;
-
   src = fetchurl {
     url = http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz;
     sha256 = "d714840e3b14e1fa9c432c4be0044b7c008d904dece0d611554655b979cad4c3";
   };
 
   meta = {
-    description = "i810switch is a utility for switching the LCD and external VGA display.";
+    description = "A utility for switching between the LCD and external VGA display on Intel graphics cards";
     homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html";
     license = "GPL2";
   };
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
index f08af39c701..a4e86658193 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
@@ -3,7 +3,7 @@
 assert cross == null -> stdenv.isLinux;
 
 let
-  version = "2.6.32.9";
+  version = "2.6.32.16";
   kernelHeadersBaseConfig = if (cross == null) then
       stdenv.platform.kernelHeadersBaseConfig
     else
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "1g6hs7j5kmifb3phbnckdmrnxd0cpqrijnnbry86z26npsh9my7l";
+    sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
   };
 
   targetConfig = if (cross != null) then cross.config else null;
diff --git a/pkgs/os-specific/linux/kernel/cifs-timeout.patch b/pkgs/os-specific/linux/kernel/cifs-timeout.patch
new file mode 100644
index 00000000000..b2dac3f016c
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cifs-timeout.patch
@@ -0,0 +1,47 @@
+diff -ru -x '*~' /tmp/linux-2.6.32.14/fs/cifs/transport.c linux-2.6.32.14/fs/cifs/transport.c
+--- /tmp/linux-2.6.32.14/fs/cifs/transport.c	2010-05-26 23:29:57.000000000 +0200
++++ linux-2.6.32.14/fs/cifs/transport.c	2010-06-20 22:03:13.000000000 +0200
+@@ -166,9 +166,9 @@
+ 			   after the retries we will kill the socket and
+ 			   reconnect which may clear the network problem.
+ 			*/
+-			if ((i >= 14) || (!server->noblocksnd && (i > 2))) {
++			if ((i >= 119) || (!server->noblocksnd && (i > 2))) {
+ 				cERROR(1,
+-				   ("sends on sock %p stuck for 15 seconds",
++				   ("sends on sock %p stuck for 120 seconds",
+ 				    ssocket));
+ 				rc = -EAGAIN;
+ 				break;
+@@ -459,11 +459,11 @@
+ 		goto out;
+ 
+ 	if (long_op == CIFS_STD_OP)
+-		timeout = 15 * HZ;
++		timeout = 120 * HZ;
+ 	else if (long_op == CIFS_VLONG_OP) /* e.g. slow writes past EOF */
+ 		timeout = 180 * HZ;
+ 	else if (long_op == CIFS_LONG_OP)
+-		timeout = 45 * HZ; /* should be greater than
++		timeout = 120 * HZ; /* should be greater than
+ 			servers oplock break timeout (about 43 seconds) */
+ 	else if (long_op == CIFS_ASYNC_OP)
+ 		goto out;
+@@ -651,7 +651,7 @@
+ 		goto out;
+ 
+ 	if (long_op == CIFS_STD_OP)
+-		timeout = 15 * HZ;
++		timeout = 120 * HZ;
+ 	/* wait for 15 seconds or until woken up due to response arriving or
+ 	   due to last connection to this server being unmounted */
+ 	else if (long_op == CIFS_ASYNC_OP)
+@@ -659,7 +659,7 @@
+ 	else if (long_op == CIFS_VLONG_OP) /* writes past EOF can be slow */
+ 		timeout = 180 * HZ;
+ 	else if (long_op == CIFS_LONG_OP)
+-		timeout = 45 * HZ; /* should be greater than
++		timeout = 120 * HZ; /* should be greater than
+ 			servers oplock break timeout (about 43 seconds) */
+ 	else if (long_op == CIFS_BLOCKING_OP)
+ 		timeout = 0x7FFFFFFF; /* large but no so large as to wrap */
diff --git a/pkgs/os-specific/linux/kernel/dell-rfkill.patch b/pkgs/os-specific/linux/kernel/dell-rfkill.patch
new file mode 100644
index 00000000000..32f890c84f6
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/dell-rfkill.patch
@@ -0,0 +1,23 @@
+Ensure that the dell-bluetooth device does not stay in the "hard
+blocked" state.
+
+From https://patchwork.kernel.org/patch/37539/
+
+diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
+index 74909c4..cf40c4e 100644
+--- a/drivers/platform/x86/dell-laptop.c
++++ b/drivers/platform/x86/dell-laptop.c
+@@ -197,8 +197,11 @@  static void dell_rfkill_query(struct rfkill *rfkill, void *data)
+ 	dell_send_request(&buffer, 17, 11);
+ 	status = buffer.output[1];
+ 
+-	if (status & BIT(bit))
+-		rfkill_set_hw_state(rfkill, !!(status & BIT(16)));
++	/*
++	 * Don't change state unless the read-only HW rfkill switch is disabled.
++	 */
++	if (status & BIT(16))
++		rfkill_set_hw_state(rfkill, !!(status & BIT(bit)));
+ }
+ 
+ static const struct rfkill_ops dell_rfkill_ops = {
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 558cde5a890..1554624b3a7 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.47";
+    version = "2.6.27.48";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "1bwyj2cykybi23c005mcqn13gjc4bd1hhg3qc3iab3zw04iy08ir";
+      sha256 = "0l3gyp7z6b2qs30s1xhj8lm1sd8cracz21ixcqpdgs7rspkagdfk";
     };
 
     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 81fbaade19d..b32616572f1 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -206,11 +206,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.32.14";
+    version = "2.6.32.16";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "1j7hry3bqkafwvgfldy8dvwryi0rfhsk36nrsa6g6d0g75p12ccz";
+      sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
     };
 
     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 367ca425d8f..86b6e02a292 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.5";
+    version = "2.6.33.6";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "12130kbq41a5h7vziy0zaynqr8d2y5gniarjlx9x9rymacqqmp74";
+      sha256 = "0s7lfm9b6i056gqlj1naqda5lwc540s05ws7m6i2a6s79zgw784i";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
index 1a1c712bad9..ab3ba5bc95c 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.34.nix
@@ -194,11 +194,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.34";
+    version = "2.6.34.1";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "0cr64m6vqj7vcp28p2hjxn087yasyfw4hqjvp0fdycz6gpn5yfgs";
+      sha256 = "0v78yvkwr100v7bnrkkabxmpv5hjg1ngrjbr5d0kkzsw4d7bmm5x";
     };
 
     config = configWithPlatform stdenv.platform;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 2e5232025dd..4019348375a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -155,4 +155,27 @@ in
       features.aufsBase = true;
     };
 
+  # Increase the timeout on CIFS requests from 15 to 120 seconds to
+  # make CIFS more resilient to high load on the CIFS server.
+  cifs_timeout =
+    { name = "cifs-timeout";
+      patch = ./cifs-timeout.patch;
+      features.cifsTimeout = true;
+    };
+
+  no_xsave =
+    { name = "no-xsave";
+      patch = fetchurl {
+        url = "http://cvs.fedoraproject.org/viewvc/devel/kernel/fix_xen_guest_on_old_EC2.patch?revision=1.1&view=co";
+        name = "no-xsave.patch";
+        sha256 = "02f51f9b636b105c81a3ed62145abdc0ecb043b8114eb10257854577f617f894";
+      };
+      features.noXsave = true;
+    };
+
+  dell_rfkill =
+    { name = "dell-rfkill";
+      patch = ./dell-rfkill.patch;
+    };
+  
 }
diff --git a/pkgs/os-specific/linux/kvm/76.nix b/pkgs/os-specific/linux/kvm/76.nix
deleted file mode 100644
index 99d16b27a84..00000000000
--- a/pkgs/os-specific/linux/kvm/76.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, fetchurl, linuxHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}:
-   
-assert stdenv.isLinux;
-   
-stdenv.mkDerivation {
-  name = "kvm-76";
-   
-  src = fetchurl {
-    url = mirror://sourceforge/kvm/kvm-76.tar.gz;
-    sha256 = "06gf2aic6n0b3fnd9vi0llyydr2w6qnx1k8imm710862xhncpssk";
-  };
-
-  patches = [
-    # Allow setting the path to Samba through $QEMU_SMBD_COMMAND.
-    ./smbd-path.patch
-    # The makefile copies stuff from the kernel directory and then
-    # tries to modify the copy, but it must be made writable first.
-    ./readonly-kernel-r2.patch
-  ];
-
-  configureFlags = "--with-patched-kernel --kerneldir=${linuxHeaders}";
-
-  # e2fsprogs is needed for libuuid.
-  # rsync is a weird dependency used for copying kernel header files.
-  buildInputs = [zlib e2fsprogs SDL alsaLib pkgconfig rsync];
-
-  preConfigure = ''
-    for i in configure user/configure; do
-      substituteInPlace $i --replace /bin/bash $shell
-    done
-    substituteInPlace libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack
-  '';
-
-  meta = {
-    homepage = http://kvm.qumranet.com/;
-    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
-  };
-}
diff --git a/pkgs/os-specific/linux/kvm/86.nix b/pkgs/os-specific/linux/kvm/86.nix
deleted file mode 100644
index 5989988d5aa..00000000000
--- a/pkgs/os-specific/linux/kvm/86.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{stdenv, fetchurl, linuxHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}:
-   
-assert stdenv.isLinux;
-   
-stdenv.mkDerivation rec {
-  name = "kvm-86";
-   
-  src = fetchurl {
-    url = "mirror://sourceforge/kvm/${name}.tar.gz";
-    sha256 = "17fq2dyd0qla0yiddyiqvb8kz3sfy6dhy9fi9y7xcbhs26s0wxax";
-  };
-
-  patches = [
-    # Allow setting the path to Samba through $QEMU_SMBD_COMMAND.
-    ./smbd-path-r3.patch
-
-    # Support the "vga" kernel command line option when using the
-    # -kernel option.
-    ./x86_boot_vidmode.patch
-  ];
-
-  configureFlags = "--enable-io-thread";
-
-  # e2fsprogs is needed for libuuid.
-  # rsync is a weird dependency used for copying kernel header files.
-  buildInputs = [zlib SDL alsaLib pkgconfig pciutils];
-
-  preConfigure = ''
-    for i in configure kvm/configure kvm/user/configure; do
-      substituteInPlace $i --replace /bin/bash $shell
-    done
-    
-    substituteInPlace kvm/libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack
-
-    # This prevents the kernel module from being built.
-    rm kvm/kernel/configure
-  '';
-
-  meta = {
-    homepage = http://kvm.qumranet.com/;
-    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
-  };
-}
diff --git a/pkgs/os-specific/linux/kvm/88.nix b/pkgs/os-specific/linux/kvm/88.nix
deleted file mode 100644
index 2a8a1b0ef19..00000000000
--- a/pkgs/os-specific/linux/kvm/88.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{stdenv, fetchurl, linuxHeaders, zlib, SDL, alsaLib, pkgconfig, pciutils}:
-   
-assert stdenv.isLinux;
-   
-stdenv.mkDerivation rec {
-  name = "kvm-88";
-   
-  src = fetchurl {
-    url = "mirror://sourceforge/kvm/${name}.tar.gz";
-    sha256 = "0gmmcwgkfk15wkcjaaa28nrzb0w3vbhg8p585qin61hz6kcy8ryw";
-  };
-
-  configureFlags = "--enable-io-thread";
-
-  # e2fsprogs is needed for libuuid.
-  # rsync is a weird dependency used for copying kernel header files.
-  buildInputs = [zlib SDL alsaLib pkgconfig pciutils];
-
-  preConfigure = ''
-    for i in configure kvm/configure kvm/user/configure; do
-      substituteInPlace $i --replace /bin/bash $shell
-    done
-    
-    substituteInPlace kvm/libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack
-
-    # This prevents the kernel module from being built.
-    rm kvm/kernel/configure
-  '';
-
-  meta = {
-    homepage = http://kvm.qumranet.com/;
-    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
-  };
-}
diff --git a/pkgs/os-specific/linux/kvm/readonly-kernel-r2.patch b/pkgs/os-specific/linux/kvm/readonly-kernel-r2.patch
deleted file mode 100644
index 663db508b43..00000000000
--- a/pkgs/os-specific/linux/kvm/readonly-kernel-r2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -rc kvm-74-orig/kernel/Makefile kvm-74/kernel/Makefile
-*** kvm-74-orig/kernel/Makefile	2008-08-27 10:53:37.000000000 +0200
---- kvm-74/kernel/Makefile	2008-08-29 14:12:00.000000000 +0200
-***************
-*** 59,64 ****
---- 59,65 ----
-  	-rsync -R \
-  	     "$(LINUX)"/arch/$(ARCH_DIR)/include/asm/./kvm*.h \
-               $T/include/asm-$(ARCH_DIR)/
-+ 	chmod -R u+w $T
-  
-  	set -e && for i in $(find $T -name '*.h'); do \
-  		$(call unifdef,$$i); done
-Only in kvm-74/kernel: Makefile~
-Only in kvm-74/kernel: Makefile.rej
diff --git a/pkgs/os-specific/linux/kvm/smbd-path-r3.patch b/pkgs/os-specific/linux/kvm/smbd-path-r3.patch
deleted file mode 100644
index 32099ad6930..00000000000
--- a/pkgs/os-specific/linux/kvm/smbd-path-r3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -rc kvm-86/net.c kvm-86-new/net.c
-*** kvm-86/net.c	2009-05-19 18:29:02.000000000 +0200
---- kvm-86-new/net.c	2009-06-02 17:41:15.000000000 +0200
-***************
-*** 684,694 ****
-          slirp_init(slirp_restrict, slirp_ip);
-      }
-  
-!     /* XXX: better tmp dir construction */
-!     snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%ld", (long)getpid());
-!     if (mkdir(smb_dir, 0700) < 0) {
-!         fprintf(stderr, "qemu: could not create samba server dir '%s'\n", smb_dir);
-!         exit(1);
-      }
-      snprintf(smb_conf, sizeof(smb_conf), "%s/%s", smb_dir, "smb.conf");
-  
---- 684,696 ----
-          slirp_init(slirp_restrict, slirp_ip);
-      }
-  
-!     while (1) {
-!         snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%ld.%d", (long) getpid(), random());
-!         if (mkdir(smb_dir, 0700) == 0) break;
-!         if (errno != EEXIST) {
-!             fprintf(stderr, "qemu: could not create samba server dir '%s'\n", smb_dir);
-!             exit(1);
-!         }
-      }
-      snprintf(smb_conf, sizeof(smb_conf), "%s/%s", smb_dir, "smb.conf");
-  
-diff -rc kvm-86/net.h kvm-86-new/net.h
-*** kvm-86/net.h	2009-05-19 18:29:02.000000000 +0200
---- kvm-86-new/net.h	2009-06-02 17:39:17.000000000 +0200
-***************
-*** 129,135 ****
-  #ifdef __sun__
-  #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
-  #else
-! #define SMBD_COMMAND "/usr/sbin/smbd"
-  #endif
-  
-  #endif
---- 129,135 ----
-  #ifdef __sun__
-  #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
-  #else
-! #define SMBD_COMMAND "smbd"
-  #endif
-  
-  #endif
diff --git a/pkgs/os-specific/linux/kvm/smbd-path.patch b/pkgs/os-specific/linux/kvm/smbd-path.patch
deleted file mode 100644
index 5844ebefcf5..00000000000
--- a/pkgs/os-specific/linux/kvm/smbd-path.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -rc kvm-57-orig/qemu/vl.c kvm-57/qemu/vl.c
-*** kvm-57-orig/qemu/vl.c	2007-12-18 16:57:46.000000000 +0100
---- kvm-57/qemu/vl.c	2008-08-26 13:17:57.000000000 +0200
-***************
-*** 141,147 ****
-  #ifdef __sun__
-  #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
-  #else
-! #define SMBD_COMMAND "/usr/sbin/smbd"
-  #endif
-  
-  //#define DEBUG_UNUSED_IOPORT
---- 141,147 ----
-  #ifdef __sun__
-  #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
-  #else
-! #define SMBD_COMMAND "smbd"
-  #endif
-  
-  //#define DEBUG_UNUSED_IOPORT
-***************
-*** 3828,3838 ****
-          slirp_init();
-      }
-  
-!     /* XXX: better tmp dir construction */
-!     snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%d", getpid());
-!     if (mkdir(smb_dir, 0700) < 0) {
-!         fprintf(stderr, "qemu: could not create samba server dir '%s'\n", smb_dir);
-!         exit(1);
-      }
-      snprintf(smb_conf, sizeof(smb_conf), "%s/%s", smb_dir, "smb.conf");
-  
---- 3828,3840 ----
-          slirp_init();
-      }
-  
-!     while (1) {
-!         snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%d.%d", getpid(), random());
-!         if (mkdir(smb_dir, 0700) == 0) break;
-!         if (errno != EEXIST) {
-!             fprintf(stderr, "qemu: could not create samba server dir '%s'\n", smb_dir);
-!             exit(1);
-!         }
-      }
-      snprintf(smb_conf, sizeof(smb_conf), "%s/%s", smb_dir, "smb.conf");
-  
-Only in kvm-57/qemu: vl.c~
diff --git a/pkgs/os-specific/linux/kvm/x86_boot_vidmode.patch b/pkgs/os-specific/linux/kvm/x86_boot_vidmode.patch
deleted file mode 100644
index 2ff6dd566c4..00000000000
--- a/pkgs/os-specific/linux/kvm/x86_boot_vidmode.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Based on http://www.mail-archive.com/qemu-commits@nongnu.org/msg00202/qemu.x86_boot_vidmode.patch. 
-
-diff -Nupr qemu/hw/pc.c qemu-new/hw/pc.c
---- qemu/hw/pc.c	2009-05-26 16:10:44.000000000 +0800
-+++ qemu-new/hw/pc.c	2009-05-26 17:17:25.000000000 +0800
-@@ -593,6 +593,78 @@ static long get_file_size(FILE *f)
-     return size;
- }
- 
-+static uint16_t hato16i(char *hex)
-+{
-+	uint16_t integer = 0;
-+	if(hex[1] == 'x')
-+	   hex += 2;
-+
-+    while(*hex != '\0'){
-+		integer = (integer<<4);
-+
-+		if(*hex >= 0x30 && *hex <= 0x39){ /*0~9*/
-+			integer += *hex - 0x30;
-+		}else if(*hex >= 0x61 && *hex <= 0x66){ /*a~f*/
-+			integer += *hex - 0x61 + 0xa;
-+		}else if(*hex >= 0x41 && *hex <= 0x46){ /*A~F*/
-+			integer += *hex - 0x41 + 0x1;
-+		}else
-+			break;
-+
-+		hex++;
-+	}	
-+	return integer;
-+}
-+
-+static uint16_t ato16i(char *dec)
-+{
-+	uint16_t integer = 0;
-+
-+    while(*dec != '\0'){
-+		integer *= 10;
-+
-+		if(*dec >= 0x30 && *dec <= 0x39){ /*0~9*/
-+			integer += *dec - 0x30;
-+		}else
-+			break;
-+
-+		dec++;
-+	}	
-+	return integer;
-+}
-+
-+static int get_vga_mode(const char* kernel_cmdline, uint16_t *vga_mode)
-+{
-+	char mode[7];
-+	int i = 0;
-+	char *p	= strstr(kernel_cmdline, "vga=");
-+	if(p == NULL)
-+		return 1;
-+
-+	p += 4;
-+
-+	while(*p != ' ' && *p != '\0' && i < 6)	{
-+		mode[i] = *p;
-+		i++;
-+		p++;	  
-+	}
-+	mode[i] = 0;
-+
-+	if(!strncmp(mode, "ask", 3)){
-+		*vga_mode = 0xfffd;
-+	}else if(!strncmp(mode, "normal",6)){
-+		*vga_mode = 0xffff;
-+	}else if(!strncmp(mode, "ext", 3)){
-+		*vga_mode = 0xfffe;
-+	}else if(!strncmp(mode, "0x", 2)){//in hexdecimal 
-+		*vga_mode = hato16i(mode);
-+	}else	//in decimal 
-+		*vga_mode = ato16i(mode);
-+
-+	return 0;
-+}
-+
-+ 
- static void load_linux(target_phys_addr_t option_rom,
-                        const char *kernel_filename,
- 		       const char *initrd_filename,
-@@ -605,6 +676,7 @@ static void load_linux(target_phys_addr_
-     uint16_t real_seg;
-     int setup_size, kernel_size, initrd_size, cmdline_size;
-     uint32_t initrd_max;
-+	uint16_t vid_mode;
-     uint8_t header[1024];
-     target_phys_addr_t real_addr, prot_addr, cmdline_addr, initrd_addr;
-     FILE *f, *fi;
-@@ -683,6 +755,12 @@ static void load_linux(target_phys_addr_
-     if (protocol >= 0x200)
- 	header[0x210] = 0xB0;
- 
-+	/*parse cmdline and set vga mode*/
-+	if(!get_vga_mode(kernel_cmdline, &vid_mode)){
-+		header[0x1fa] = vid_mode&0xff;
-+		header[0x1fb] = (vid_mode&0xff00)>>8;
-+	}
-+
-     /* heap */
-     if (protocol >= 0x201) {
- 	header[0x211] |= 0x80;	/* CAN_USE_HEAP */
diff --git a/pkgs/os-specific/linux/libcg/default.nix b/pkgs/os-specific/linux/libcg/default.nix
new file mode 100644
index 00000000000..221150dc891
--- /dev/null
+++ b/pkgs/os-specific/linux/libcg/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, pam, yacc, flex}:
+
+stdenv.mkDerivation rec {
+  name = "libcgroup-0.36.2";
+  src = fetchurl {
+    url = "mirror://sourceforge/libcg/${name}.tar.bz2";
+    sha256 = "1qvkd976485vyshaq1cwjzg6w54c3djsaic024yx3sfp14f1gnvz";
+  };
+  buildInputs = [ pam yacc flex ];
+  meta = {
+    description = "library that abstracts the control group file system in Linux";
+    homepage = "http://libcg.sourceforge.net";
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix
new file mode 100644
index 00000000000..09cd4ab037c
--- /dev/null
+++ b/pkgs/os-specific/linux/lsiutil/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, unzip }:
+
+let
+
+  version = "1.60";
+
+  src = fetchurl {
+    name = "lsiutil-${version}.zip";
+    url = "http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/hbas/fibre_channel/hardware_drivers/LSIUtil%20Kit_${version}.zip";
+    sha256 = "1d4337faa56e24f7d98db87b9de94d6e2c17ab671f4e301b93833eea08b9e426";
+  };  
+
+in
+
+stdenv.mkDerivation rec {
+  name = "lsiutils-${version}";
+  
+  srcs = [ src "Source/lsiutil.tar.gz" ];
+
+  buildInputs = [ unzip ];
+
+  sourceRoot = "lsiutil";
+
+  preBuild =
+    ''
+      ensureDir $out/bin
+      substituteInPlace Makefile --replace /usr/bin $out/bin
+      substituteInPlace lsiutil.c \
+        --replace /sbin/modprobe modprobe \
+        --replace /bin/mknod $(type -P mknod)
+    '';
+
+  installPhase = "true";
+  
+  meta = {
+    homepage = http://www.lsi.com/;
+    description = "LSI Logic Fusion MPT command line management tool";
+    license = "unfree";
+  };
+}
diff --git a/pkgs/os-specific/linux/mountall/no-plymouth.patch b/pkgs/os-specific/linux/mountall/no-plymouth.patch
index 04beb6ce7a8..6bf8c95276b 100644
--- a/pkgs/os-specific/linux/mountall/no-plymouth.patch
+++ b/pkgs/os-specific/linux/mountall/no-plymouth.patch
@@ -12,7 +12,7 @@ diff -ru -x '*~' mountall-2.15-orig/configure.ac mountall-2.15/configure.ac
  
 diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
 --- mountall-2.15-orig/src/mountall.c	2010-05-09 01:42:24.000000000 +0200
-+++ mountall-2.15/src/mountall.c	2010-06-07 13:04:19.000000000 +0200
++++ mountall-2.15/src/mountall.c	2010-07-07 14:40:47.000000000 +0200
 @@ -64,8 +64,10 @@
  #include <nih-dbus/dbus_proxy.h>
  #include <nih-dbus/errors.h>
@@ -80,7 +80,22 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  
  /**
   * plymouth_error:
-@@ -1475,7 +1485,8 @@
+@@ -1208,11 +1218,12 @@
+ 			nih_debug ("%s is root filesystem", MOUNT_NAME (mnt));
+ 			tag = TAG_LOCAL;
+ 		} else if (is_remote (mnt)) {
+-			if ((! strcmp (mnt->mountpoint, "/usr"))
++			if ((! has_option (mnt, "nobootwait", FALSE)) && (
++                            (! strcmp (mnt->mountpoint, "/usr"))
+ 			    || (! strcmp (mnt->mountpoint, "/var"))
+ 			    || (! strncmp (mnt->mountpoint, "/usr/", 5))
+ 			    || (! strncmp (mnt->mountpoint, "/var/", 5))
+-			    || (has_option (mnt, "bootwait", FALSE)))
++			    || (has_option (mnt, "bootwait", FALSE))))
+ 			{
+ 				tag = TAG_REMOTE;
+ 			} else {
+@@ -1475,7 +1486,8 @@
  	/* Enforce local only after virtual filesystems triggered */
  	if ((! local_triggered)
  	    && virtual_triggered
@@ -90,7 +105,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  		nih_info (_("%s finished"), "local");
  		emit_event ("local-filesystems", NULL);
  		local_triggered = TRUE;
-@@ -1484,7 +1495,8 @@
+@@ -1484,7 +1496,8 @@
  	/* Enforce remote only after virtual filesystems triggrered */
  	if ((! remote_triggered)
  	    && virtual_triggered
@@ -100,7 +115,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  		nih_info (_("%s finished"), "remote");
  		emit_event ("remote-filesystems", NULL);
  		remote_triggered = TRUE;
-@@ -1494,7 +1506,9 @@
+@@ -1494,7 +1507,9 @@
  	if ((! filesystem_triggered)
  	    && virtual_triggered
  	    && local_triggered
@@ -111,7 +126,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  		nih_info (_("All filesystems mounted"));
  		emit_event ("filesystem", NULL);
  		filesystem_triggered = TRUE;
-@@ -1508,9 +1522,9 @@
+@@ -1508,9 +1523,9 @@
  		swap_triggered = TRUE;
  	}
  
@@ -124,7 +139,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  		   num_virtual_mounted, num_virtual,
  		   num_swap_mounted, num_swap);
  }
-@@ -2203,12 +2217,14 @@
+@@ -2203,12 +2218,14 @@
  	if (no_events)
  		return;
  
@@ -140,7 +155,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	env = NIH_MUST (nih_str_array_new (NULL));
  
  	if (mnt) {
-@@ -2787,6 +2803,7 @@
+@@ -2787,6 +2804,7 @@
  int
  plymouth_connect (void)
  {
@@ -148,7 +163,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	/* If we were already connected, just re-use that connection */
  	if (ply_boot_client)
  		return TRUE;
-@@ -2813,8 +2830,13 @@
+@@ -2813,8 +2831,13 @@
  	nih_info (_("Connected to Plymouth"));
  
  	return TRUE;
@@ -162,7 +177,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  void
  plymouth_disconnected (void *             user_data,
  		       ply_boot_client_t *client)
-@@ -2827,6 +2849,7 @@
+@@ -2827,6 +2850,7 @@
  	ply_boot_client_free (ply_boot_client);
  	ply_boot_client = NULL;
  }
@@ -170,7 +185,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  
  
  void
-@@ -2837,6 +2860,7 @@
+@@ -2837,6 +2861,7 @@
  
  	nih_assert (mnt != NULL);
  
@@ -178,7 +193,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	/* No Plymouth => no progress information */
  	if (! plymouth_connect ())
  		return;
-@@ -2866,6 +2890,7 @@
+@@ -2866,6 +2891,7 @@
  				       plymouth_response,
  				       plymouth_failed,
  				       NULL);
@@ -186,7 +201,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  }
  
  void
-@@ -2881,20 +2906,31 @@
+@@ -2881,20 +2907,31 @@
  		NIH_LIST_FOREACH (mounts, iter) {
  			Mount *mnt = (Mount *)iter;
  
@@ -220,7 +235,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	/* If we're already displaying messages, don't change them unless
  	 * the message is no longer valid for that mount point; otherwise
  	 * clear the message.
-@@ -3005,8 +3041,10 @@
+@@ -3005,8 +3042,10 @@
  							   plymouth_answer,
  							   plymouth_failed,
  							   NULL);
@@ -231,7 +246,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  void
  plymouth_response (void *             user_data,
  		   ply_boot_client_t *client)
-@@ -3125,7 +3163,7 @@
+@@ -3125,7 +3164,7 @@
  		break;
  	}
  }
@@ -240,7 +255,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  
  
  /**
-@@ -3211,6 +3249,7 @@
+@@ -3211,6 +3250,7 @@
  				    (NihIoWatcher)udev_monitor_watcher,
  				    udev_monitor));
  
@@ -248,7 +263,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	/* Initialise a Plymouth event loop; this is an epoll instance that
  	 * we can poll within our own main loop and call out to when needs
  	 * be.
-@@ -3224,6 +3263,7 @@
+@@ -3224,6 +3264,7 @@
  
  	/* Attempt an early connection to Plymouth */
  	plymouth_connect ();
@@ -256,7 +271,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  
  	mounts = NIH_MUST (nih_list_new (NULL));
  
-@@ -3236,7 +3276,9 @@
+@@ -3236,7 +3277,9 @@
  	 * from /etc/fstab and /proc/self/mountinfo to find out what else
  	 * we need to do.
  	 */
@@ -266,7 +281,7 @@ diff -ru -x '*~' mountall-2.15-orig/src/mountall.c mountall-2.15/src/mountall.c
  	parse_fstab (_PATH_MNTTAB);
  	parse_mountinfo ();
  
-@@ -3338,10 +3380,12 @@
+@@ -3338,10 +3381,12 @@
  	/* Flush the D-Bus connection to ensure all messages are sent */
  	dbus_connection_flush (connection);
  
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index 20ae58702a2..c36f29ca6c7 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, kernel, perl }:
+
 stdenv.mkDerivation {
   name = "ndiswrapper-1.53-stable";
 
@@ -21,19 +22,19 @@ stdenv.mkDerivation {
   '';
 
   # should we use unstable? 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://downloads.sourceforge.net/ndiswrapper/ndiswrapper-1.53.tar.gz;
     sha256 = "00622nxa3q9n8v7qdz274d0nzz9r13lx77xi27s5bnk0mkila03q";
   };
 
-  buildInputs =[kernel perl];
+  buildInputs = [ kernel perl ];
 
   # this is a patch against svn head, not stable version
   patches = [./prefix.patch];
 
   meta = { 
-      description = "Ndis driver wrapper for the Linux kernel";
-      homepage = http://sourceforge.net/projects/ndiswrapper;
-      license = "GPL";
+    description = "Ndis driver wrapper for the Linux kernel";
+    homepage = http://sourceforge.net/projects/ndiswrapper;
+    license = "GPL";
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 6941288b390..bad0d8aabd2 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -10,25 +10,16 @@ unpackFile() {
 
 buildPhase() {
     if test -z "$libsOnly"; then
-        echo "Building linux driver against kernel: " $kernel;
-
-        cd usr/src/nv/
-
-        # Workaround: get it to build on kernels that have CONFIG_XEN
-        # set.  Disable the test, apply a patch to disable the Xen
-        # functionality.
-        
-        #substituteInPlace Makefile.kbuild --replace xen_sanity_check fnord
-        #patch -p1 < $xenPatch
-
         # Create the module.
+        echo "Building linux driver against kernel: $kernel";
+        cd kernel
         kernelVersion=$(cd $kernel/lib/modules && ls)
         sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/)
         unset src # used by the nv makefile
         # Hack necessary to compile on 2.6.28.
         export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default"
         make SYSSRC=$sysSrc module
-        cd ../../..
+        cd ..
     fi
 }
 
@@ -37,10 +28,12 @@ installPhase() {
 
     # Install libGL and friends.
     ensureDir $out/lib
-    cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/
-
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so
-    ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so.1
+    cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libvdpau.* libXv* tls $out/lib/
+    ensureDir $out/lib/vdpau
+    cp -p libvdpau_* $out/lib/vdpau
+    
+    ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so
+    ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so.1
     ln -snf libGL.so.$versionNumber $out/lib/libGL.so
     ln -snf libGL.so.$versionNumber $out/lib/libGL.so.1
     ln -snf libnvidia-cfg.so.$versionNumber $out/lib/libnvidia-cfg.so.1
@@ -51,20 +44,21 @@ installPhase() {
 
     patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
     patchelf --set-rpath $out/lib:$glPath $out/lib/libXvMCNVIDIA.so.*.*
-    set +e
-    # Legacy nvidia doesn't have cuda
     patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
-    set -e
     
     if test -z "$libsOnly"; then
         
         # Install the kernel module.
         ensureDir $out/lib/modules/$kernelVersion/misc
-        cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc
+        cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
 
         # Install the X driver.
         ensureDir $out/lib/xorg/modules
-        cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/
+        cp -p libnvidia-wfb.* $out/lib/xorg/modules/
+        ensureDir $out/lib/xorg/modules/drivers
+        cp -p nvidia_drv.so $out/lib/xorg/modules/drivers
+        ensureDir $out/lib/xorg/modules/extensions
+        cp -p libglx.so.* $out/lib/xorg/modules/extensions
 
         ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1
         ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so
@@ -75,13 +69,23 @@ installPhase() {
         ensureDir $out/bin
 
         for i in nvidia-settings nvidia-xconfig; do
-	    cp usr/bin/$i $out/bin/$i
+	    cp $i $out/bin/$i
 	    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
 	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
         done
     
         # Header files etc.
-        cp -prd usr/include usr/share $out
+        ensureDir $out/include/nvidia
+        cp -p *.h $out/include/nvidia
+
+        ensureDir $out/share/man/man1
+        cp -p *.1.gz $out/share/man/man1
+
+        ensureDir $out/share/applications
+        cp -p *.desktop $out/share/applications
+
+        ensureDir $out/share/pixmaps
+        cp -p nvidia-settings.png $out/share/pixmaps
 
         # Patch the `nvidia-settings.desktop' file.
         substituteInPlace $out/share/applications/nvidia-settings.desktop \
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index bc88775b02f..bd3ee349244 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "195.36.24"; in
+let versionNumber = "256.35"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -17,13 +17,13 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run";
-        sha256 = "0h96356jmmk283ijq30zimp3wxldsaddrk03gy3jifj1v29iklcg";
+        url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
+        sha256 = "0qpn9i1z3b0zafpk97inmhr21wp93pjf76z9jxrxhi3jzkbbdxla";
       }
     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 = "1car62fgzy4gvgmqjywbdpascrasqwv3knlyw6zzr7r84qabzc1a";
+        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
+        sha256 = "0in4b9k0nlbvnxrnh1v1d8m24wyljanymyh6w86yvirp24b4wang";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix
index 55a51a752c2..69222d5a24d 100644
--- a/pkgs/os-specific/linux/qemu-kvm/default.nix
+++ b/pkgs/os-specific/linux/qemu-kvm/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
    
 stdenv.mkDerivation rec {
-  name = "qemu-kvm-0.12.4";
+  name = "qemu-kvm-0.12.5";
    
   src = fetchurl {
     url = "mirror://sourceforge/kvm/${name}.tar.gz";
-    sha256 = "07hqcjg97i8j4cvpq3nicwhnc8dvd23rjyl1arr8ayzg1mdgx28l";
+    sha256 = "0gsqmws24s96g1h0z2m8r28pyv08wnzh5jip925ym167rfp8bh14";
   };
 
   patches = [ ./unix-domain.patch ./smb-tmpdir.patch ];
diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix
index d4d39606d62..ff3cad3fe98 100644
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/pkgs/os-specific/linux/radeontools/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pciutils }:
+
 stdenv.mkDerivation {
   name = "radeontool-1.5";
 
@@ -6,26 +7,26 @@ stdenv.mkDerivation {
 
   # Don't know wether it's a good idea to hardcode the lspci path..
   # But it will work on nix..
-  postUnpack = "
-    cd $sourceRoot;
-    sed -i \"s%lspci%\$pciutils/sbin/lspci%g\" radeontool.c
+  postUnpack = ''
+    cd $sourceRoot
+    sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c
     cd ..
-  ";
+  '';
 
   src = fetchurl {
     url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
     sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
   };
 
-  installPhase = "
-    ensureDir \$out/bin
+  installPhase = ''
+    ensureDir $out/bin
     chmod +x lightwatch.pl
-    cp radeontool lightwatch.pl \$out/bin
-  ";
+    cp radeontool lightwatch.pl $out/bin
+  '';
 
   meta = { 
-      description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
-      homepage = http://fdd.com/software/radeon/;
-      license = "ZLIB";
-    };
+    description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
+    homepage = http://fdd.com/software/radeon/;
+    license = "ZLIB";
+  };
 }
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index dcaee64b03c..6c7f9083c72 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam }:
+{ stdenv, fetchurl, pam, glibc }:
    
 stdenv.mkDerivation rec {
   name = "shadow-4.1.4.2";
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ pam ];
 
   patches = [ ./no-sanitize-env.patch ./su-name.patch ./keep-path.patch ];
+
+  preBuild =
+    ''
+      substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd
+    '';
   
   meta = {
     homepage = http://pkg-shadow.alioth.debian.org/;
diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index d6007c9f957..4dec9200ed5 100644
--- a/pkgs/os-specific/linux/udev/default.nix
+++ b/pkgs/os-specific/linux/udev/default.nix
@@ -1,27 +1,27 @@
-{stdenv, fetchurl, gperf, pkgconfig, glib, acl, 
-  libusb, usbutils, pciutils, ...}:
+{ stdenv, fetchurl, gperf, pkgconfig, glib, acl
+, libusb, usbutils, pciutils }:
 
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  name = "udev-154";
+  name = "udev-160";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
-    sha256 = "1aw5vn96gasvkjh6nfivaf68l6ph33y63zf7gnp3mc7c7zfncm0c";
+    sha256 = "0wx43bxiff8i80k7w3j2iszksdzw1hz6sanx8cjsiypgppi4fr12";
   };
 
-  buildInputs = [gperf pkgconfig glib acl libusb usbutils];
+  buildInputs = [ gperf pkgconfig glib acl libusb usbutils ];
 
-  configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids
-    --disable-introspection
-    --with-firmware-path=/root/test-firmware:/var/run/current-system/firmware";
+  configureFlags =
+    ''
+      --with-pci-ids-path=${pciutils}/share/pci.ids
+      --disable-introspection
+      --with-firmware-path=/root/test-firmware:/var/run/current-system/firmware
+    '';
 
   postInstall =
     ''
-      # Install some rules that really should be installed by default.
-      cp rules/packages/40-pilot-links.rules $out/libexec/rules.d/
-
       # The path to rule_generator.functions in write_cd_rules and
       # write_net_rules is broken.  Also, don't store the mutable
       # persistant rules in /etc/udev/rules.d but in
diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix
index b29e6629ff0..3f21e515e46 100644
--- a/pkgs/os-specific/linux/upstart/default.nix
+++ b/pkgs/os-specific/linux/upstart/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, dbus, libnih }:
 
 stdenv.mkDerivation rec {
-  name = "upstart-0.6.5";
+  name = "upstart-0.6.6";
   
   src = fetchurl {
     url = "http://upstart.ubuntu.com/download/0.6/${name}.tar.gz";
-    sha256 = "1kyj2xqvcn9pww3cm5i18svl7ark4a4dbqnm3hiclp4z1jwr01lw";
+    sha256 = "1cy962n4ljjxfxaigcnqsl9gq8j09j28g5jg19zk4lc7h1503d3s";
   };
 
   buildInputs = [ pkgconfig dbus libnih ];
diff --git a/pkgs/os-specific/linux/upstart/jobcontrol.nix b/pkgs/os-specific/linux/upstart/jobcontrol.nix
deleted file mode 100644
index 5be0276ffd5..00000000000
--- a/pkgs/os-specific/linux/upstart/jobcontrol.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-	name = "upstart-jobcontrol";
-	buildCommand = "
-		mkdir -p \$out/bin
-		echo '
-			file=/etc/event.d/\$1
-			shift
-			controlscript=\$(egrep exec\\|respawn \$file | tail | sed -e s/^\\\\s\\\\+//g  | sed -e s/\\\\s\\\\+/\\ /g | cut -f 2 -d \\  )
-			echo Running \$controlscript \"\$@\"
-			\$controlscript \"\$@\"
-		' >\$out/bin/jobcontrol
-		chmod a+x \$out/bin/jobcontrol
-	";
-}
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 4d692c97ad7..b3093b22a25 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -1,24 +1,24 @@
-{stdenv, fetchurl, pkgconfig, libusb}:
+{ stdenv, fetchurl, pkgconfig, libusb }:
 
 let
 
   # Obtained from http://www.linux-usb.org/usb.ids.bz2.
   usbids = fetchurl {
-    url = http://nixos.org/tarballs/usb.ids.20090808.bz2;
-    sha256 = "1007p5cm3k6vdsfrkwy92yvscazycz71k8wx32jygr50qsv1advj";
+    url = http://nixos.org/tarballs/usb.ids.20100720.bz2;
+    sha256 = "0krncssk0b10z6grw305824zma953l3g2rb7jkk25mb78pw5fd5d";
   };
 
 in
 
 stdenv.mkDerivation rec {
-  name = "usbutils-0.84";
+  name = "usbutils-0.86";
   
   src = fetchurl {
     url = "mirror://sourceforge/linux-usb/${name}.tar.gz";
-    sha256 = "1aksgfsnxq43q3aas4cwhmy34ik3h2sg4iv2al9vz2v9aqnib83n";
+    sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk";
   };
   
-  buildInputs = [pkgconfig libusb];
+  buildInputs = [ pkgconfig libusb ];
   
   preBuild = "bunzip2 < ${usbids} > usb.ids";
 
diff --git a/pkgs/os-specific/linux/util-linux-ng/default.nix b/pkgs/os-specific/linux/util-linux-ng/default.nix
index 226db5f1b3d..ca21deb6489 100644
--- a/pkgs/os-specific/linux/util-linux-ng/default.nix
+++ b/pkgs/os-specific/linux/util-linux-ng/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses ? null, ... }:
+{ stdenv, fetchurl, ncurses ? null }:
 
 stdenv.mkDerivation rec {
   name = "util-linux-ng-2.17.2";
diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix
index bc88d56ae31..eb9d09d2a11 100644
--- a/pkgs/os-specific/linux/wvdial/default.nix
+++ b/pkgs/os-specific/linux/wvdial/default.nix
@@ -1,13 +1,14 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "wvdial-1.16";
+{ stdenv, fetchurl, wvstreams, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "wvdial-1.61";
 
   src = fetchurl {
-    url = http://wvstreams.googlecode.com/files/wvdial-1.61.tar.gz;
+    url = "http://wvstreams.googlecode.com/files/${name}.tar.gz";
     sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg";
   };
 
-  buildInputs = [wvstreams pkgconfig];
+  buildInputs = [ wvstreams pkgconfig ];
 
   preConfigure = ''
     find -type f | xargs sed -i 's@/bin/bash@bash@g'
@@ -17,10 +18,10 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "dialer automatically recognizing the modem";
+    description = "A dialer that automatically recognises the modem";
     homepage = http://alumnit.ca/wiki/index.php?page=WvDial;
     license = "LGPL";
-    maintainers = [stdenv.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix
index 0be61a1a558..ac897554ce2 100644
--- a/pkgs/servers/dico/default.nix
+++ b/pkgs/servers/dico/default.nix
@@ -1,15 +1,16 @@
-{ fetchurl, stdenv, libtool, gettext, zlib, readline, guile, python }:
+{ fetchurl, stdenv, libtool, gettext, zlib, readline, gsasl
+, guile, python }:
 
 stdenv.mkDerivation rec {
-  name = "dico-2.0";
+  name = "dico-2.1";
 
   src = fetchurl {
     url = "mirror://gnu/dico/${name}.tar.gz";
-    sha256 = "03cpg16jbsv5xh9mvyjj7myvpdpb82354a1yjrhcy0k5w8faa9kv";
+    sha256 = "0cs4jxnz6g5xqrhkbnycn7jl9fs8jfjh33vza7i68m8qmjwx2vza";
   };
 
   # XXX: Add support for GNU SASL.
-  buildInputs = [ libtool gettext zlib readline guile python ];
+  buildInputs = [ libtool gettext zlib readline gsasl guile python ];
 
   doCheck = true;
 
diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix
index eacf2371d36..5e5d91fa820 100644
--- a/pkgs/servers/fingerd/bsd-fingerd/default.nix
+++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix
@@ -1,17 +1,20 @@
-args: with args;
+{ stdenv, fetchurl }:
+
+# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'.
+
 stdenv.mkDerivation rec {
-	name = "bsd-fingerd-0.17";
+  name = "bsd-fingerd-0.17";
 
-	src = fetchurl {
-		url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz";
-		sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
-	};
+  src = fetchurl {
+    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz";
+    sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
+  };
 
-	NIX_CFLAGS_COMPILE="-D_GNU_SOURCE";
+  NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
 
-	patches = [./ubuntu-0.17-9.patch];
+  patches = [ ./ubuntu-0.17-9.patch ];
 
-	preBuild = "cd fingerd";
+  preBuild = "cd fingerd";
 
-	preInstall = '' ensureDir $out/man/man8 $out/sbin '';
+  preInstall = '' ensureDir $out/man/man8 $out/sbin '';
 }
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 10e6d658714..85006a1d175 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, openssl, libcap, pam }:
 
 stdenv.mkDerivation rec {
   name = "vsftpd-2.0.5";
+  
   src = fetchurl {
     url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz";
     sha256 = "0nzsxknnaqnfk853yjsmi31sl02jf5ydix9wxbldv4i7vzqfnqjl";
@@ -10,16 +11,18 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
 
   preInstall = ''
-  ensureDir $out/{,s}bin
-  ensureDir $out/man/man{5,8}
+    ensureDir $out/{,s}bin
+    ensureDir $out/man/man{5,8}
   '';
 
   patches = [ ./fix.patch ] ;
-  preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h;
-                   sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c'';
+  
+  preConfigure = ''
+    sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h
+    sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c
+  '';
 
-  configFile = ./vsftpd.user_list;
   postInstall = "cp ${./vsftpd.user_list} $out/vsftpd.user_list";
 
-  buildInputs = [ openssl libcap pam configFile ];
+  buildInputs = [ openssl libcap pam ];
 }
diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
new file mode 100644
index 00000000000..f5a8aab9850
--- /dev/null
+++ b/pkgs/servers/http/4store/default.nix
@@ -0,0 +1,48 @@
+x@{builderDefsPackage
+  , librdf_raptor, librdf_rasqal,
+  glib, libxml2, pcre, avahi,
+  readline, ncurses, expat,
+  zlib, pkgconfig, which,
+  perl,
+  db_dir ? "/var/lib/4store"
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  s = import ./src-for-default.nix;
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    ["db_dir"];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doFixConfigure" "doConfigure" "doMakeInstall"
+    "fixInterpreter"];
+
+  doFixConfigure = a.fullDepEntry ''
+    sed -e 's@#! */bin/bash@#! ${a.stdenv.shell}@' -i configure
+    find . -name Makefile -exec sed -e "s@/usr/local@$out@g" -i '{}' ';'
+    sed -e '/\/var\/lib\/4store/d' -i src/utilities/Makefile
+    
+    sed -e 's@/var/lib/4store@${db_dir}@g' -i src/common/params.h src/utilities/*
+  '' ["minInit" "doUnpack"];
+
+  fixInterpreter = (a.doPatchShebangs "$out/bin");
+      
+  meta = {
+    description = "SparQL query server (RDF storage)";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+  };
+}) x
+
diff --git a/pkgs/servers/http/4store/src-for-default.nix b/pkgs/servers/http/4store/src-for-default.nix
new file mode 100644
index 00000000000..a8624ab40ab
--- /dev/null
+++ b/pkgs/servers/http/4store/src-for-default.nix
@@ -0,0 +1,9 @@
+rec {
+   version="v1.0.3";
+   name="4store-v1.0.3";
+   hash="1d3n2xgqrq2kgigql3slxw1w2bml3b57xa7h6x9dbngxcz11xg22";
+   url="http://4store.org/download/4store-${version}.tar.gz";
+   advertisedUrl="http://4store.org/download/4store-v1.0.3.tar.gz";
+  
+  
+}
diff --git a/pkgs/servers/http/4store/src-info-for-default.nix b/pkgs/servers/http/4store/src-info-for-default.nix
new file mode 100644
index 00000000000..91a9bad92de
--- /dev/null
+++ b/pkgs/servers/http/4store/src-info-for-default.nix
@@ -0,0 +1,6 @@
+{
+  downloadPage = "http://4store.org/download/";
+  baseName = "4store";
+  choiceCommand = "tail -n 1";
+  versionExtractorSedScript = "s@.*-(v[0-9.]+)[.].*@\\1@";
+}
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 5cea1e14548..c0184b87538 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2 }:
+
+stdenv.mkDerivation {
   name = "lighttpd-1.4.19";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.lighttpd.net/download/lighttpd-1.4.19.tar.bz2;
     sha256 = "1mziqb36ik9z4lf1h5ccm1h4ab7d2hx0cz0g5425lwy374r34fd2";
   };
 
-  buildInputs =(with args; [pcre libxml2 zlib attr bzip2]);
+  buildInputs = [ pcre libxml2 zlib attr bzip2 ];
 
   meta = {
-      description = "Lightweight high-performance web server";
-      homepage = http://www.lighttpd.net/;
-      license = "BSD";
+    description = "Lightweight high-performance web server";
+    homepage = http://www.lighttpd.net/;
+    license = "BSD";
   };
 }
diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix
new file mode 100644
index 00000000000..87a89072ec6
--- /dev/null
+++ b/pkgs/servers/http/redstore/default.nix
@@ -0,0 +1,32 @@
+x@{builderDefsPackage
+  , redland, pkgconfig, gmp
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  s = import ./src-for-default.nix;
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "doMakeInstall"];
+      
+  meta = {
+    description = "An HTTP interface to Redland RDF store";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux ++ freebsd ++ gnu;
+  };
+}) x
+
diff --git a/pkgs/servers/http/redstore/src-for-default.nix b/pkgs/servers/http/redstore/src-for-default.nix
new file mode 100644
index 00000000000..963abcb7dbb
--- /dev/null
+++ b/pkgs/servers/http/redstore/src-for-default.nix
@@ -0,0 +1,9 @@
+rec {
+   version="0.4";
+   name="redstore-0.4";
+   hash="1fs54v0d0kkqaz9ajacabb8wifrglvg6kkhd5b0mxmnng352wpp7";
+   url="http://redstore.googlecode.com/files/redstore-${version}.tar.gz";
+   advertisedUrl="http://redstore.googlecode.com/files/redstore-0.4.tar.gz";
+  
+  
+}
diff --git a/pkgs/servers/http/redstore/src-info-for-default.nix b/pkgs/servers/http/redstore/src-info-for-default.nix
new file mode 100644
index 00000000000..fe1082a587e
--- /dev/null
+++ b/pkgs/servers/http/redstore/src-info-for-default.nix
@@ -0,0 +1,6 @@
+{
+  downloadPage = "http://code.google.com/p/redstore/downloads/list";
+  baseName = "redstore";
+  choiceCommand = '' head -n 1 | 
+   sed -re "s@[&].*@@; s@.*[?]name=(.*)@http://$(sed -re "s@.*/p/([^/]+)/.*@\\1@" <<< "$(getAttr downloadPage)").googlecode.com/files/\\1@" '';
+}
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index e428f4d649f..ddbdc4346ae 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, openssl, zlib }:
 
 stdenv.mkDerivation {
   name = "ircd-hybrid-7.2.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1xn4dfbgx019mhismfnr2idhslvarlajyahj7c6bqzmarcwwrvck";
   };
 
-  buildInputs = [openssl zlib];
+  buildInputs = [ openssl zlib ];
 
   configureFlags =
     "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}";
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 5e0440d9c9f..40af6207243 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, hal, avahi
+{ stdenv, fetchurl, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
 , gconf, liboil, gtk, libX11, libICE, libSM, libXtst, libXi, intltool, gettext
-, libcap, alsaLib, libsamplerate, libsndfile, speex }:
+, libcap, alsaLib, libsamplerate, libsndfile, speex, bluez, udev
+, ...}:
 
 stdenv.mkDerivation rec {
   name = "pulseaudio-0.9.21";
@@ -14,10 +15,10 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gdbm ];
 
   buildInputs = [
-    pkgconfig gnum4 libtool glib dbus hal avahi gconf liboil
+    pkgconfig gnum4 libtool glib dbus avahi gconf liboil
     libsamplerate libsndfile speex alsaLib libcap
     gtk libX11 libICE libSM libXtst libXi
-    intltool gettext
+    intltool gettext bluez udev
   ];
 
   preConfigure = ''
@@ -32,7 +33,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = ''
-    --disable-solaris --disable-udev --disable-jack --disable-bluez --localstatedir=/var
+    --disable-solaris --disable-hal --disable-jack --localstatedir=/var
+    --disable-oss-output --disable-oss-wrapper
   '';
 
   meta = {
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 8b81f5290d0..60733275509 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libtasn1, libgcrypt, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "shishi-0.0.43";
+  name = "shishi-1.0.0";
 
   src = fetchurl {
-    url = "ftp://alpha.gnu.org/gnu/shishi/${name}.tar.gz";
-    sha256 = "17hj4lklvprws6r5bhavi43yj3bz8sv554gcqvvsjrsq8w3qjxm0";
+    url = "mirror://gnu/shishi/${name}.tar.gz";
+    sha256 = "1j8jbfsdpwqqfv7938gy4b6kvdai3l2nk8267sv18rbp95k9j7ig";
   };
 
   buildInputs = [ libtasn1 libgcrypt gnutls ] ;
@@ -16,16 +16,16 @@ stdenv.mkDerivation rec {
     description = "GNU Shishi, free implementation of the Kerberos 5 network security system";
 
     longDescription =
-      '' GNU Shishi is an implementation of the Kerberos 5 network 
-         authentication system, as specified in RFC 4120. Shishi can be 
-         used to authenticate users in distributed systems.
-
-         Shishi contains a library ('libshishi') that can be used by
-         application developers to add support for Kerberos 5.  Shishi
-         contains a command line utility ('shishi') that is used by
-         users to acquire and manage tickets (and more).  The server
-         side, a Key Distribution Center, is implemented by 'shishid'.
-       '';
+      '' GNU Shishi is an implementation of the Kerberos 5 network
+	 authentication system, as specified in RFC 4120.  Shishi can be
+	 used to authenticate users in distributed systems.
+
+	 Shishi contains a library (`libshishi') that can be used by
+	 application developers to add support for Kerberos 5.  Shishi
+	 contains a command line utility (1shishi') that is used by
+	 users to acquire and manage tickets (and more).  The server
+	 side, a Key Distribution Center, is implemented by `shishid'.
+      '';
 
     homepage = http://www.gnu.org/software/shishi/;
     license = "GPLv3+";
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 398f7beb541..2293e2ab316 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -1,42 +1,41 @@
-args: with args;
-
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
-
-    name = "monetdb-may-2009";
-
-    src = fetchurl {
-      url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2;
-      sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj";
-    };
-
-    flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }
-            // {
-              java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; };
-              /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
-            };
-
-    buildInputs = [ (pcre.override { unicodeSupport = true; })
-                     openssl readline libxml2]; # optional python perl php java ?
-
-    cfg = {
-      geomSupport = true;
-      javaSupport = true;
-    };
-
-    configurePhase = ":";
-    buildPhase = ":";
-    # --enable-template (nightly or cvs sources)
-    # --enable-optimise
-    # --enable-geom (geos-config required ?)
-    installPhase = ''
-      mkdir $TMP/build
-      sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery
-    '';
-
-    meta = { 
-        description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
-        homepage = http://monetdb.cwi.nl/;
-        license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html 
-    };
-  }
+{ composableDerivation, fetchurl, pcre, openssl, readline, libxml2, geos, apacheAnt, jdk5 }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
+
+  name = "monetdb-may-2009";
+
+  src = fetchurl {
+    url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2;
+    sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj";
+  };
+
+  flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }
+          // {
+            java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; };
+            /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
+          };
+
+  buildInputs = [ (pcre.override { unicodeSupport = true; })
+                   openssl readline libxml2 ]; # optional python perl php java ?
+
+  cfg = {
+    geomSupport = true;
+    javaSupport = true;
+  };
+
+  configurePhase = ":";
+  buildPhase = ":";
+  
+  installPhase = ''
+    mkdir $TMP/build
+    sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery
+  '';
+
+  meta = { 
+    description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
+    homepage = http://monetdb.cwi.nl/;
+    license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html 
+  };
+}
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index 8275d0e2ee9..3a2fc55dfc0 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, ant}:
 
 stdenv.mkDerivation {
-  name = "mysql-connector-java-5.1.6";
+  name = "mysql-connector-java-5.1.13";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://mirror.hostfuss.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.6.tar.gz;
-    md5 = "84641aa4ddc138fc400366021f05cec5";
+    url = http://mirror.hostfuss.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.13.tar.gz;
+    sha256 = "1y0x9a7d0qfn9bb2114v65407wnjwhz1ylxk0fn997gvwy43schi";
   };
 
   buildInputs = [ant];
diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix
index d6ec490a31c..973df7b5d58 100644
--- a/pkgs/servers/sql/postgresql/8.3.x.nix
+++ b/pkgs/servers/sql/postgresql/8.3.x.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.3.9"; in
+let version = "8.3.11"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "08z6p3hha0v5841kzz5mhz1gsyvriijssx5p8bah8cvw4i00xcaw";
+    sha256 = "1nvjcsa0218849r2913mxia58cjgcw6rikkf1g7kmjb902lv3aw1";
   };
 
-  buildInputs = [zlib ncurses readline];
+  buildInputs = [ zlib ncurses readline ];
 
   LC_ALL = "en_US";
 
diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 0d40e4708d2..aaade4d1b56 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.4.2"; in
+let version = "8.4.4"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
   
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "1wk9k1nsz304c8mxrx4iix1ss38fpp13by46x5v5s6cn0g4wbcxd";
+    sha256 = "0zp35f0q84id3jz2nlwgp2qxplywh4lfg2p5i9nv2zszas6kjsz6";
   };
 
-  buildInputs = [zlib ncurses readline];
+  buildInputs = [ zlib ncurses readline ];
 
   LC_ALL = "C";
 
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 84de382d19c..4332e35f905 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -68,11 +68,11 @@ let
   })) // {inherit ;};
     
   dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) {
-    name = "dri2proto-2.2";
+    name = "dri2proto-2.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/dri2proto-2.2.tar.bz2;
-      sha256 = "18djh2vy6z67hl1v63wc1kw7q35s92ixj5p2lffpshz4zq7ralpk";
+      url = mirror://xorg/individual/proto/dri2proto-2.3.tar.bz2;
+      sha256 = "0xz6nf5rrn1fvply5mq7dd1w89r73mggylp9lpzzwdfvl291h55j";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -498,11 +498,11 @@ let
   })) // {inherit libICE xproto ;};
     
   imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) {
-    name = "imake-1.0.2";
+    name = "imake-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/imake-1.0.2.tar.bz2;
-      sha256 = "0yxca3hbz4hfk0fm385lbm89061p2nksr5klx2y3x1knmvsgzklp";
+      url = mirror://xorg/individual/util/imake-1.0.3.tar.bz2;
+      sha256 = "1sjknp0g39r7ywp44drcrb8r92159a9nxgnjc90mjcksvm2540ch";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
@@ -578,11 +578,11 @@ let
   })) // {inherit windowswmproto libX11 libXext xextproto ;};
     
   libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
-    name = "libX11-1.3.2";
+    name = "libX11-1.3.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/libX11-1.3.2.tar.bz2;
-      sha256 = "1cmwnk3k4dsirg895rrz7pmcsjjrai8ng7gjy68dd1ffkxf4vvsd";
+      url = mirror://xorg/individual/lib/libX11-1.3.4.tar.bz2;
+      sha256 = "0i58i744fh9jp0wdyifc9ip5ahvanniyfzana0s15kgpwn627mw8";
     };
     buildInputs = [pkgconfig bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ];
   })) // {inherit bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ;};
@@ -598,11 +598,11 @@ let
   })) // {inherit scrnsaverproto libX11 libXext xextproto ;};
     
   libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
-    name = "libXau-1.0.5";
+    name = "libXau-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/libXau-1.0.5.tar.bz2;
-      sha256 = "1vh8h4fhf6i59qwqqd4i2ki2qv0hajpx3cp1ri2rryi9iplb60x5";
+      url = mirror://xorg/individual/lib/libXau-1.0.6.tar.bz2;
+      sha256 = "1z3h07wj2kg2hnzj4gd9pc3rkj4n0mfw6f9skg9w1hfwzrgl317f";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
@@ -618,11 +618,11 @@ let
   })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
     
   libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
-    name = "libXcomposite-0.4.1";
+    name = "libXcomposite-0.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/libXcomposite-0.4.1.tar.bz2;
-      sha256 = "04vs1ml9y60g8046kg79wn71455m2c8xn1c88sq8wb92cmas459p";
+      url = mirror://xorg/individual/lib/libXcomposite-0.4.2.tar.bz2;
+      sha256 = "007qcqhp0dhvq2v7nkpz282rbwa6m9pmmpg4ypb30hv8yw5xwas4";
     };
     buildInputs = [pkgconfig compositeproto fixesproto libX11 libXext libXfixes xproto ];
   })) // {inherit compositeproto fixesproto libX11 libXext libXfixes xproto ;};
@@ -638,11 +638,11 @@ let
   })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
     
   libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
-    name = "libXdamage-1.1.2";
+    name = "libXdamage-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/libXdamage-1.1.2.tar.bz2;
-      sha256 = "02kwzk41a2b9wmlvrivz7nhbl15vihrjla7fl38w89s8nfn10sm5";
+      url = mirror://xorg/individual/lib/libXdamage-1.1.3.tar.bz2;
+      sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw";
     };
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
   })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
@@ -658,31 +658,31 @@ let
   })) // {inherit xproto ;};
     
   libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
-    name = "libXext-1.1.1";
+    name = "libXext-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/libXext-1.1.1.tar.bz2;
-      sha256 = "1cwv3sllfk1xwc7gkld8ifyxrgkl3j0d1539amcnda5kgyyf630i";
+      url = mirror://xorg/individual/lib/libXext-1.1.2.tar.bz2;
+      sha256 = "0x2gzqrdzdzyrw8h9qz4ml8yyplb5ki78pvf17ibdjajkkv0ysmc";
     };
     buildInputs = [pkgconfig libX11 xextproto xproto ];
   })) // {inherit libX11 xextproto xproto ;};
     
   libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
-    name = "libXfixes-4.0.4";
+    name = "libXfixes-4.0.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/libXfixes-4.0.4.tar.bz2;
-      sha256 = "0j1vwd5jwqc6wzv2jz18al2qdzm7k9kgs2x5rcq7r461qpjxfcds";
+      url = mirror://xorg/individual/lib/libXfixes-4.0.5.tar.bz2;
+      sha256 = "0x4drdxrslxf4vgcfyba0f0fbxg98c8x5dfrl7azakhf8qhd0v1f";
     };
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
   })) // {inherit fixesproto libX11 xextproto xproto ;};
     
   libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
-    name = "libXfont-1.4.1";
+    name = "libXfont-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/libXfont-1.4.1.tar.bz2;
-      sha256 = "0ybndzh6hc9l8arvvc6j5cbbby52b9n5654r9kndx60bh8qgqaqi";
+      url = mirror://xorg/individual/lib/libXfont-1.4.2.tar.bz2;
+      sha256 = "0ns99rhfz29y6bbc8slfaxjr132bb9x072vnhgv2kzfbk62mlpyh";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
   })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
@@ -704,7 +704,7 @@ let
       url = mirror://xorg/X11R7.5/src/everything/libXi-1.3.tar.bz2;
       sha256 = "0jwl19w8ry30v4wyar3fv9xbhzp3fbx1mq6p7c342s1qc068qarn";
     };
-    buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto xmlto asciidoc ];
+    buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ];
   })) // {inherit inputproto libX11 libXext xextproto xproto ;};
     
   libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
@@ -758,11 +758,11 @@ let
   })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
     
   libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
-    name = "libXrender-0.9.5";
+    name = "libXrender-0.9.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/libXrender-0.9.5.tar.bz2;
-      sha256 = "1mfmbvq3xsx81zd1fj595b8ar2asdva4lvxcrdsbdqjbi91r01dw";
+      url = mirror://xorg/individual/lib/libXrender-0.9.6.tar.bz2;
+      sha256 = "0s567qgys8m6782lbrpvpscm8fkk2jm2717g7s3hm7hhcgib2n3z";
     };
     buildInputs = [pkgconfig renderproto libX11 xproto ];
   })) // {inherit renderproto libX11 xproto ;};
@@ -778,11 +778,11 @@ let
   })) // {inherit resourceproto libX11 libXext xextproto xproto ;};
     
   libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) {
-    name = "libXt-1.0.7";
+    name = "libXt-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/libXt-1.0.7.tar.bz2;
-      sha256 = "1v59vll1jy4g2c3jpljj1xyw4nggqpn6jlnffiglbj31n1454vbh";
+      url = mirror://xorg/individual/lib/libXt-1.0.8.tar.bz2;
+      sha256 = "0z03nbb0lhxshpnyx2nl9kw0n3civjkag1mfiqf82qc64n0jrxbh";
     };
     buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
   })) // {inherit libICE kbproto libSM libX11 xproto ;};
@@ -868,11 +868,11 @@ let
   })) // {inherit xproto zlib ;};
     
   libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) {
-    name = "libpciaccess-0.11.0";
+    name = "libpciaccess-0.12.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libpciaccess-0.11.0.tar.bz2;
-      sha256 = "1avx3kn44lk3xs49q8bqh8hqi08x0inab2zxlrk3rj2nnq9bwf3f";
+      url = mirror://xorg/individual/lib/libpciaccess-0.12.0.tar.bz2;
+      sha256 = "0msnx3mcbqgghjscq3z1nh894k71k3bx659iaqlhgaqa3h7c1czn";
     };
     buildInputs = [pkgconfig zlib ];
   })) // {inherit zlib ;};
@@ -888,11 +888,11 @@ let
   })) // {inherit ;};
     
   libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
-    name = "libxcb-1.4";
+    name = "libxcb-1.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/libxcb-1.4.tar.bz2;
-      sha256 = "17i0sfm66gkqycsyr6iw5q16fbf8qp0sw39ir1nv1gp4vp9y5dh7";
+      url = http://xcb.freedesktop.org/dist/libxcb-1.6.tar.bz2;
+      sha256 = "0di9mm6d8wmscgfaw6sfa8znrk522y8dnl4xhy87wqx4fhbwirhs";
     };
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
   })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
@@ -958,11 +958,11 @@ let
   })) // {inherit libfontenc freetype xproto zlib ;};
     
   pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) {
-    name = "pixman-0.16.4";
+    name = "pixman-0.18.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/pixman-0.16.4.tar.bz2;
-      sha256 = "07ndvwxmkrc4zyxpi8ndjmyj509cm411ajrc6qj6clr5y5c96vi9";
+      url = mirror://xorg/individual/lib/pixman-0.18.2.tar.bz2;
+      sha256 = "08rr88cy33k427vyxryxa9yssfy6j9s9m1vcvqmjl2949qv63818";
     };
     buildInputs = [pkgconfig perl ];
   })) // {inherit perl ;};
@@ -1068,11 +1068,11 @@ let
   })) // {inherit libICE libSM libX11 libXext libXmu libXt ;};
     
   utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) {
-    name = "util-macros-1.3.0";
+    name = "util-macros-1.10.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/util-macros-1.3.0.tar.bz2;
-      sha256 = "1akibdzirycdz1p2z7awngrqan7cc1waxq497jsgc10zp5ssm6bc";
+      url = mirror://xorg/individual/util/util-macros-1.10.0.tar.bz2;
+      sha256 = "0a8in00qqyksij66wgk1m1cp6n4lii88a0c6g1s7cqshwp5b6lmr";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -1138,11 +1138,11 @@ let
   })) // {inherit ;};
     
   xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
-    name = "xcb-proto-1.5";
+    name = "xcb-proto-1.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-proto-1.5.tar.bz2;
-      sha256 = "0f269j48h545pp99j316ab0wmriyr8xfz5ykrcxpfclgiqjmpwqc";
+      url = http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2;
+      sha256 = "18jwkgd2ayvd0zzwawnbh86b4xqjq29mgsq44h06yj8jkcaw2azm";
     };
     buildInputs = [pkgconfig python ];
   })) // {inherit python ;};
@@ -1206,16 +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";
+    name = "xdm-1.1.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xdm-1.1.9.tar.bz2;
-      sha256 = "0d5i25mn6vzhkh5ga5b403hgfmaf66q40knr06ii608d3c7dpcg7";
+      url = mirror://xorg/individual/app/xdm-1.1.10.tar.bz2;
+      sha256 = "0zzrlkmppy6mma49db2x1il47rhjqkg9rs91ryl7xyv5iqbgg1ql";
     };
-    buildInputs = [pkgconfig libXmu libX11 libXau libXinerama libXft libXpm libXaw libXdmcp libXt libXext];
-  })) // {inherit libXmu libX11 libXau libXinerama libXft libXpm libXaw libXdmcp libXt libXext;};
+    buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
+  })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
     
   xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) {
     name = "xdpyinfo-1.1.0";
@@ -1318,14 +1318,14 @@ let
   })) // {inherit inputproto randrproto xorgserver xproto ;};
     
   xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
-    name = "xf86-input-evdev-2.3.2";
+    name = "xf86-input-evdev-2.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.3.2.tar.bz2;
-      sha256 = "0a2y26fq3h1j5c16r8lhparvkr2rbah9f4jc70zcqfq1pmlz96q2";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.4.0.tar.bz2;
+      sha256 = "0sl02sx755j5kg9sd762sgqk2gnvkhj3pm76l47qhw0a2jvqmx4f";
     };
-    buildInputs = [pkgconfig xorgserver xproto ];
-  })) // {inherit xorgserver xproto ;};
+    buildInputs = [pkgconfig inputproto xorgserver xproto ];
+  })) // {inherit inputproto xorgserver xproto ;};
     
   xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) {
     name = "xf86-input-joystick-1.4.99.2";
@@ -1528,14 +1528,14 @@ 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.11.0";
+    name = "xf86-video-intel-2.12.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-intel-2.11.0.tar.bz2;
-      sha256 = "0kss9xpk160j13yvcb0s0k5hhvzcqmhplscmfwsk5cgk4ny2qafv";
+      url = mirror://xorg/individual/driver/xf86-video-intel-2.12.0.tar.bz2;
+      sha256 = "1pzzzpw0i55m6s48ac8c3a0453rskqrdb4v6s9dq5bvj3ywpysz1";
     };
-    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 ;};
+    buildInputs = [pkgconfig dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
+  })) // {inherit dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
     
   xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
     name = "xf86-video-mach64-6.8.2";
@@ -1798,14 +1798,14 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
     
   xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) {
-    name = "xf86-video-vmware-10.16.9";
+    name = "xf86-video-vmware-11.0.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-vmware-10.16.9.tar.bz2;
-      sha256 = "1hcbgqb7lfcfwrvdscg9jzh1g5vhvc4vsj1sjsywnds8nm2mwnl3";
+      url = mirror://xorg/individual/driver/xf86-video-vmware-11.0.1.tar.bz2;
+      sha256 = "1gp7gj1a1jdcqr8qa9z57h1zjf0wjhr78b7fyxbl9fl1rdd1sdx6";
     };
-    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;};
+    buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ];
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;};
     
   xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
     name = "xf86-video-voodoo-1.2.3";
@@ -1898,21 +1898,21 @@ let
   })) // {inherit ;};
     
   xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) {
-    name = "xinit-1.2.0";
+    name = "xinit-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xinit-1.2.0.tar.bz2;
-      sha256 = "0zq8cpxm1ws81xj39d0wfv29f1nj7s3pmjdashr32x918hx6cqdb";
+      url = mirror://xorg/individual/app/xinit-1.2.1.tar.bz2;
+      sha256 = "01wvdi69v9yadzavch6l8c80v1rqgxsyl6cl3byq0v8vx0xcgg0n";
     };
     buildInputs = [pkgconfig libX11 ];
   })) // {inherit libX11 ;};
     
   xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) {
-    name = "xinput-1.5.0";
+    name = "xinput-1.5.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/xinput-1.5.0.tar.bz2;
-      sha256 = "1yfazyhjdy49fwdlzxximbapliniibs8jm0vripd7vdm9gijhix8";
+      url = mirror://xorg/individual/app/xinput-1.5.2.tar.bz2;
+      sha256 = "1433lw6xv59f240rgrpgyf9qrmh9knpx64gg95bm32cjvh0qdrrc";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext libXi ];
   })) // {inherit inputproto libX11 libXext libXi ;};
@@ -1958,31 +1958,31 @@ let
   })) // {inherit libX11 libXmu ;};
     
   xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) {
-    name = "xlsatoms-1.0.2";
+    name = "xlsatoms-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/xlsatoms-1.0.2.tar.bz2;
-      sha256 = "06qjbhph27jwbp7w5iiqk6ka6h2g2nk5x9x8ilpab8jy5rldfv6n";
+      url = mirror://xorg/individual/app/xlsatoms-1.1.0.tar.bz2;
+      sha256 = "03fbknvq7rixfgpv5945s7r82jz2xc06a0n09w1p22hl4pd7l0aa";
     };
-    buildInputs = [pkgconfig libX11 libXmu ];
-  })) // {inherit libX11 libXmu ;};
+    buildInputs = [pkgconfig libxcb ];
+  })) // {inherit libxcb ;};
     
   xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) {
-    name = "xlsclients-1.0.2";
+    name = "xlsclients-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/xlsclients-1.0.2.tar.bz2;
-      sha256 = "163ni1f71gq24gm83pmqha81r44qprqv7j2b07gngk2gkp9cs9w5";
+      url = mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2;
+      sha256 = "037sph4zyar6061445xmf1bqrmm00k6qr9lpypjnrx4ragsm2nzr";
     };
-    buildInputs = [pkgconfig libX11 libXmu ];
-  })) // {inherit libX11 libXmu ;};
+    buildInputs = [pkgconfig libxcb xcbutil ];
+  })) // {inherit libxcb xcbutil ;};
     
   xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) {
-    name = "xmessage-1.0.2";
+    name = "xmessage-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2;
-      sha256 = "1hy3n227iyrm323hnrdld8knj9h82fz6s7x6bw899axcjdp03d02";
+      url = mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2;
+      sha256 = "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg";
     };
     buildInputs = [pkgconfig libXaw libXt ];
   })) // {inherit libXaw libXt ;};
@@ -2018,14 +2018,14 @@ let
   })) // {inherit ;};
     
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.7.5";
+    name = "xorg-server-1.8.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.7.5.tar.bz2;
-      sha256 = "1ampdfdijwafzlpq9jwxaxwwq40j0ymvcd922bs70wiybk8g7rci";
+      url = mirror://xorg/individual/xserver/xorg-server-1.8.2.tar.bz2;
+      sha256 = "1qmcmrv26p8645nwdm2q558mpvi75fpn9knkacanzysw5497w5aj";
     };
-    buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
-  })) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};
+    buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ];
+  })) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;};
     
   xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
     name = "xorg-sgml-doctools-1.3";
@@ -2058,21 +2058,21 @@ let
   })) // {inherit libX11 ;};
     
   xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
-    name = "xproto-7.0.16";
+    name = "xproto-7.0.17";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/xproto-7.0.16.tar.bz2;
-      sha256 = "0wlnxg51mz9zrdsx2zxr5mw56i5vcbnz69d30x7fs3cww4fdl942";
+      url = mirror://xorg/individual/proto/xproto-7.0.17.tar.bz2;
+      sha256 = "00cxgwaijhz7vp60washz03nvwk42f7sz72xkzfcx01pbgf1yb4v";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
   xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) {
-    name = "xrandr-1.3.2";
+    name = "xrandr-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.5/src/everything/xrandr-1.3.2.tar.bz2;
-      sha256 = "0j92j67067l6nj1nhfwdik7c14cgxdzn9f0v2irlajd68i337m1l";
+      url = mirror://xorg/individual/app/xrandr-1.3.3.tar.bz2;
+      sha256 = "0iiywk10vi56k7bpdlhn4wv0friz8vzz6dbfhy1xrnrvsgkg73wn";
     };
     buildInputs = [pkgconfig libX11 libXrandr libXrender ];
   })) // {inherit libX11 libXrandr libXrender ;};
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index e930e14e801..405e041545d 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,6 +1,5 @@
-http://xcb.freedesktop.org/dist/xcb-proto-1.5.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2
 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/libxcb-1.6.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
+mirror://xorg/individual/lib/pixman-0.18.2.tar.bz2
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index e3473fa6b14..2e4ff56294c 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -21,7 +21,7 @@ my %pcMap;
 my %extraAttrs;
 
 
-my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "hal", "openssl", "gperf", "m4");
+my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4");
 $pcMap{$_} = $_ foreach @missingPCs;
 $pcMap{"freetype2"} = "freetype";
 $pcMap{"libpng12"} = "libpng";
@@ -46,8 +46,7 @@ while (<>) {
     die unless defined $1;
     my $pkg = $1;
     $pkg =~ s/-//g;
-    #next unless $pkg eq "printproto";
-    #print "$pkg\n";
+    #next unless $pkg eq "xcbutil";
 
     $tarball =~ /\/([^\/]*)\.tar\.bz2$/;
     my $pkgName = $1;
@@ -77,25 +76,25 @@ while (<>) {
     my $pkgDir = `echo $tmpDir/*`;
     chomp $pkgDir;
 
-    my $provides = `cd $pkgDir && ls *.pc.in`;
+    my $provides = `find $pkgDir -name "*.pc.in"`;
     my @provides2 = split '\n', $provides;
     my @requires = ();
     
-    print "PROVIDES @provides2\n\n";
     foreach my $pcFile (@provides2) {
         my $pc = $pcFile;
+        $pc =~ s/.*\///;
         $pc =~ s/.pc.in//;
-        die "collission with $pcMap{$pc}" if defined $pcMap{$pc};
+        print "PROVIDES $pc\n";
+        die "collision with $pcMap{$pc}" if defined $pcMap{$pc};
         $pcMap{$pc} = $pkg;
 
-        print "$pkgDir/$pcFile\n";
-        open FOO, "<$pkgDir/$pcFile" or die;
+        open FOO, "<$pcFile" or die;
         while (<FOO>) {
             if (/Requires:(.*)/) {
                 my @reqs = split ' ', $1;
                 foreach my $req (@reqs) {
                     next unless $req =~ /^[a-z]+$/;
-                    print "REQUIRE (from $pcFile): $req\n";
+                    print "REQUIRE (from $pc): $req\n";
                     push @requires, $req;
                 }
             }
@@ -193,6 +192,7 @@ while (<>) {
     process \@requires, $1 while $file =~ /REQUIRED_LIBS=\"(.*)\"/g;
     process \@requires, $1 while $file =~ /REQUIRED_MODULES=\"(.*)\"/g;
     process \@requires, $1 while $file =~ /REQUIRES=\"(.*)\"/g;
+    process \@requires, $1 while $file =~ /X11_REQUIRES=\'(.*)\'/g;
     process \@requires, $1 while $file =~ /XDMCP_MODULES=\"(.*)\"/g;
     process \@requires, $1 while $file =~ /XORG_MODULES=\"(.*)\"/g;
     process \@requires, $1 while $file =~ /NEEDED=\"(.*)\"/g;
diff --git a/pkgs/servers/x11/xorg/imake.patch b/pkgs/servers/x11/xorg/imake.patch
index 56ab6334075..0426e448215 100644
--- a/pkgs/servers/x11/xorg/imake.patch
+++ b/pkgs/servers/x11/xorg/imake.patch
@@ -1,88 +1,37 @@
-diff -rc imake-orig/imake.c imake-X11R7.0-1.0.1/imake.c
-*** imake-orig/imake.c	2005-11-08 07:33:24.000000000 +0100
---- imake-X11R7.0-1.0.1/imake.c	2006-01-11 01:12:57.000000000 +0100
-***************
-*** 1056,1061 ****
---- 1056,1062 ----
-  static void
-  get_distrib(FILE *inFile)
-  {
-+ #if 0
-    struct stat sb;
-  
-    static char* suse = "/etc/SuSE-release";
-***************
-*** 1101,1106 ****
---- 1102,1108 ----
-       * at the content of /etc/debian_version */
-      return;
-    }
-+ #endif  
-    /* what's the definitive way to tell what any particular distribution is? */
-  
-    fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
-***************
-*** 1349,1402 ****
-  static boolean
-  get_gcc(char *cmd)
-  {
-!   struct stat sb;
-!     static char* gcc_path[] = {
-! # if defined(linux) || \
-!      defined(__NetBSD__) || \
-!      defined(__OpenBSD__) || \
-!      defined(__FreeBSD__) || \
-!      defined(__DragonFly__) || \
-!      defined(__APPLE__) || \
-!      defined(__CYGWIN__) || \
-!      defined(__MINGW32__) || \
-!      defined(__GNU__) || \
-!      defined(__GLIBC__)
-! 	"/usr/bin/cc",	/* for Linux PostIncDir */
-! # endif
-! 	"/usr/local/bin/gcc",
-! 	"/opt/gnu/bin/gcc",
-! 	"/usr/pkg/bin/gcc"
-!     };
-! 
-! #ifdef CROSSCOMPILE
-!     static char* cross_cc_name[] = {
-! 	"cc",
-! 	"gcc"
-!     };
-! 
-!     if (CrossCompiling) {
-! 	int i;
-! 	for (i = 0; i < sizeof (cross_cc_name) / sizeof cross_cc_name[0]; i++){
-! 	    strcpy (cmd, CrossCompileDir);
-! 	    strcat (cmd, "/");
-! 	    strcat (cmd, cross_cc_name[i]);
-! 	    if (lstat (cmd, &sb) == 0) {
-! 		return TRUE;
-! 		break;
-! 	    }
-! 	}
-!     } else
-! #endif
-!       {
-! 	int i;
-! 	for (i = 0; i < sizeof (gcc_path) / sizeof gcc_path[0]; i++) {
-! 	    if (lstat (gcc_path[i], &sb) == 0) {
-! 		strcpy (cmd, gcc_path[i]);
-! 		return TRUE;
-! 	    }
-! 	}
-!       }
-!     return FALSE;
-  }
-  
-  #if defined CROSSCOMPILE || !defined __UNIXOS2__
---- 1351,1358 ----
-  static boolean
-  get_gcc(char *cmd)
-  {
-!     strcpy (cmd, "gcc");
-!     return TRUE;
-  }
-  
-  #if defined CROSSCOMPILE || !defined __UNIXOS2__
+diff -ru -x '*~' imake-1.0.3-orig/imake.c imake-1.0.3/imake.c
+--- imake-1.0.3-orig/imake.c	2009-10-16 23:45:43.000000000 +0200
++++ imake-1.0.3/imake.c	2010-07-19 12:17:12.000000000 +0200
+@@ -1035,6 +1035,7 @@
+ static void
+ get_distrib(FILE *inFile)
+ {
++#if 0
+   struct stat sb;
+ 
+   static char* suse = "/etc/SuSE-release";
+@@ -1080,6 +1081,7 @@
+      * at the content of /etc/debian_version */
+     return;
+   }
++#endif  
+   /* what's the definitive way to tell what any particular distribution is? */
+ 
+   fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
+@@ -1328,6 +1330,7 @@
+ static boolean
+ get_gcc(char *cmd)
+ {
++#if 0
+   struct stat sb;
+     static char* gcc_path[] = {
+ #if defined(linux) || \
+@@ -1376,6 +1379,9 @@
+ 	}
+       }
+     return FALSE;
++#endif
++    strcpy (cmd, "gcc");
++    return TRUE;
+ }
+ 
+ #if defined CROSSCOMPILE || !defined __UNIXOS2__
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 6599c79af53..b54159cf220 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -1,14 +1,15 @@
 mirror://xorg/individual/app/twm-1.0.4.tar.bz2
 mirror://xorg/individual/app/xclock-1.0.4.tar.bz2
+mirror://xorg/individual/app/xdm-1.1.10.tar.bz2
 mirror://xorg/individual/app/xeyes-1.1.0.tar.bz2
 mirror://xorg/individual/app/xfs-1.1.0.tar.bz2
-mirror://xorg/individual/app/xinit-1.2.0.tar.bz2
-mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2
+mirror://xorg/individual/app/xinit-1.2.1.tar.bz2
+mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2
 mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2
 mirror://xorg/individual/lib/libXxf86misc-1.0.2.tar.bz2
 mirror://xorg/individual/proto/printproto-1.0.4.tar.bz2
 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2
 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
-mirror://xorg/individual/util/imake-1.0.2.tar.bz2
+mirror://xorg/individual/util/imake-1.0.3.tar.bz2
 mirror://xorg/individual/util/lndir-1.0.1.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.3.tar.bz2
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index e8a311a651a..87d4924a363 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -135,10 +135,12 @@ in
   xorgserver = attrs: attrs // {
     patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
     buildInputs = attrs.buildInputs ++
-      [ args.zlib xorg.xf86bigfontproto xorg.glproto args.mesa xorg.xf86driproto
+      [ args.zlib args.udev args.mesa
+        xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto
         xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
-        xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.dmxproto
-        xorg.libdmx xorg.xf86vidmodeproto xorg.libXext
+        xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto
+        xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
+        xorg.recordproto xorg.libXext
       ];
     propagatedBuildInputs =
       [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ];
@@ -153,4 +155,11 @@ in
     configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
   };
 
+  lndir = attrs: attrs // {
+    preConfigure = ''
+      substituteInPlace lndir.c \
+        --replace 'n_dirs--;' ""
+    '';
+  };
+
 }
diff --git a/pkgs/servers/x11/xorg/replacements.nix b/pkgs/servers/x11/xorg/replacements.nix
index 3a7ac34e618..175d05b0a36 100644
--- a/pkgs/servers/x11/xorg/replacements.nix
+++ b/pkgs/servers/x11/xorg/replacements.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, xorg, automake, autoconf, libtool, composedArgsAndFun}:
+{stdenv, fetchurl, xorg, automake, autoconf, libtool, makeOverridable}:
 {
   xf86videoati = {src, suffix}: 
-  composedArgsAndFun stdenv.mkDerivation {
+  makeOverridable stdenv.mkDerivation {
       name = "xf86-video-ati-${suffix}";
       buildInputs = xorg.xf86videoati.buildInputs ++
          [autoconf automake libtool];
diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list
index fd0ce8edb56..37bc5d742e4 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.5.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.5.list
@@ -4,7 +4,7 @@ mirror://xorg/X11R7.5/src/everything/bigreqsproto-1.1.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/compositeproto-0.4.1.tar.bz2
 mirror://xorg/X11R7.5/src/everything/damageproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/dmxproto-2.3.tar.bz2
-mirror://xorg/individual/proto/dri2proto-2.2.tar.bz2
+mirror://xorg/individual/proto/dri2proto-2.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/encodings-1.0.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/fixesproto-4.1.1.tar.bz2
 mirror://xorg/X11R7.5/src/everything/font-adobe-100dpi-1.0.1.tar.bz2
@@ -53,19 +53,19 @@ mirror://xorg/X11R7.5/src/everything/libdmx-1.1.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libfontenc-1.0.5.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libFS-1.0.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libICE-1.0.6.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.11.0.tar.bz2
+mirror://xorg/individual/lib/libpciaccess-0.12.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libSM-1.1.1.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/X11R7.5/src/everything/libX11-1.3.2.tar.bz2
-mirror://xorg/X11R7.5/src/everything/libXau-1.0.5.tar.bz2
+mirror://xorg/individual/lib/libX11-1.3.4.tar.bz2
+mirror://xorg/individual/lib/libXau-1.0.6.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXaw-1.0.7.tar.bz2
-mirror://xorg/X11R7.5/src/everything/libXcomposite-0.4.1.tar.bz2
+mirror://xorg/individual/lib/libXcomposite-0.4.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXcursor-1.1.10.tar.bz2
-mirror://xorg/X11R7.5/src/everything/libXdamage-1.1.2.tar.bz2
+mirror://xorg/individual/lib/libXdamage-1.1.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXdmcp-1.0.3.tar.bz2
-mirror://xorg/X11R7.5/src/everything/libXext-1.1.1.tar.bz2
-mirror://xorg/X11R7.5/src/everything/libXfixes-4.0.4.tar.bz2
-mirror://xorg/X11R7.5/src/everything/libXfont-1.4.1.tar.bz2
+mirror://xorg/individual/lib/libXext-1.1.2.tar.bz2
+mirror://xorg/individual/lib/libXfixes-4.0.5.tar.bz2
+mirror://xorg/individual/lib/libXfont-1.4.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXft-2.1.14.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXi-1.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXinerama-1.1.tar.bz2
@@ -73,10 +73,10 @@ mirror://xorg/X11R7.5/src/everything/libxkbfile-1.0.6.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXmu-1.0.5.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXpm-3.5.8.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXrandr-1.3.0.tar.bz2
-mirror://xorg/X11R7.5/src/everything/libXrender-0.9.5.tar.bz2
+mirror://xorg/individual/lib/libXrender-0.9.6.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXres-1.0.4.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXScrnSaver-1.2.0.tar.bz2
-mirror://xorg/X11R7.5/src/everything/libXt-1.0.7.tar.bz2
+mirror://xorg/individual/lib/libXt-1.0.8.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXtst-1.1.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXv-1.0.5.tar.bz2
 mirror://xorg/X11R7.5/src/everything/libXvMC-1.0.5.tar.bz2
@@ -94,7 +94,7 @@ mirror://xorg/X11R7.5/src/everything/scrnsaverproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/sessreg-1.0.5.tar.bz2
 mirror://xorg/X11R7.5/src/everything/setxkbmap-1.1.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/smproxy-1.0.3.tar.bz2
-mirror://xorg/X11R7.5/src/everything/util-macros-1.3.0.tar.bz2
+mirror://xorg/individual/util/util-macros-1.10.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/videoproto-2.3.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/windowswmproto-1.0.4.tar.bz2
 mirror://xorg/X11R7.5/src/everything/x11perf-1.5.1.tar.bz2
@@ -114,7 +114,7 @@ mirror://xorg/X11R7.5/src/everything/xf86dgaproto-2.1.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86driproto-2.1.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-acecad-1.4.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-aiptek-1.3.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.3.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.4.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-input-mouse-1.5.0.tar.bz2
@@ -134,7 +134,7 @@ mirror://xorg/X11R7.5/src/everything/xf86-video-glide-1.0.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-glint-1.2.4.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-i128-1.3.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-i740-1.3.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.10.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.12.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-mach64-6.8.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-mga-1.4.11.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-neomagic-1.2.4.tar.bz2
@@ -161,7 +161,7 @@ mirror://xorg/X11R7.5/src/everything/xf86-video-trident-1.3.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-tseng-1.2.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-v4l-0.2.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vesa-2.3.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-vmware-10.16.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-vmware-11.0.1.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-voodoo-1.2.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-wsfb-0.3.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xf86-video-xgi-1.5.1.tar.bz2
@@ -170,21 +170,21 @@ mirror://xorg/X11R7.5/src/everything/xf86vidmodeproto-2.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xgamma-1.0.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xhost-1.0.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xineramaproto-1.2.tar.bz2
-mirror://xorg/X11R7.5/src/everything/xinput-1.5.0.tar.bz2
+mirror://xorg/individual/app/xinput-1.5.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xkbcomp-1.1.1.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xkbevd-1.1.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xkbutils-1.0.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xkill-1.0.2.tar.bz2
-mirror://xorg/X11R7.5/src/everything/xlsatoms-1.0.2.tar.bz2
-mirror://xorg/X11R7.5/src/everything/xlsclients-1.0.2.tar.bz2
+mirror://xorg/individual/app/xlsatoms-1.1.0.tar.bz2
+mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.7.5.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.8.2.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2
-mirror://xorg/X11R7.5/src/everything/xproto-7.0.16.tar.bz2
-mirror://xorg/X11R7.5/src/everything/xrandr-1.3.2.tar.bz2
+mirror://xorg/individual/proto/xproto-7.0.17.tar.bz2
+mirror://xorg/individual/app/xrandr-1.3.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xrdb-1.0.6.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xrefresh-1.0.3.tar.bz2
 mirror://xorg/X11R7.5/src/everything/xset-1.1.0.tar.bz2
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 7d81dd0accf..1bccfef75a6 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,10 +1,11 @@
 {stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}:
 
 stdenv.mkDerivation rec {
-  name = "ejabberd-2.1.0";
+  version = "2.1.4";
+  name = "ejabberd-2.1.4";
   src = fetchurl {
-    url = http://www.process-one.net/downloads/ejabberd/2.1.0/ejabberd-2.1.0.tar.gz;
-    sha256 = "16gn5ag3zyv578bqbz134l13cy1gl1xfa5y7dnqxgpr9gkdyrp5q";
+    url = http://www.process-one.net/downloads/ejabberd/2.1.4/ejabberd-2.1.4.tar.gz;
+    sha256 = "205ee09e38c57527cfa1a4be6ca664cec2e8c6b40eeffaac008735fcdc5e7527";
   };
   buildInputs = [ expat erlang zlib openssl pam ];
   patchPhase = ''
diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix
index dae058d3292..e5e5273783f 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -1,4 +1,6 @@
-args : with args; with builderDefs;
+{ stdenv, fetchurl, builderDefs, jre }:
+
+with builderDefs;
   let 
     version="3_6_3";
     localDefs = builderDefs.passthru.function (rec {
diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix
new file mode 100644
index 00000000000..433c22d128d
--- /dev/null
+++ b/pkgs/tools/X11/virtualgl/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, mesa, libX11, openssl, libXext, libjpeg_turbo}:
+
+let
+  libDir = if stdenv.is64bit then "lib64" else "lib";
+in
+stdenv.mkDerivation {
+  name = "virtualgl-2.1.4";
+  src = fetchurl {
+    url = mirror://sourceforge/virtualgl/VirtualGL-2.1.4.tar.gz;
+    sha256 = "d455e599620473a07711196615e59c73d08a7f392a9fcf60a6bc05d82809d89d";
+  };
+
+  patches = [ ./xshm.patch ];
+
+  prePatch = ''
+    sed -i s,LD_PRELOAD=lib,LD_PRELOAD=$out/${libDir}/lib, rr/vglrun
+  '';
+
+  preInstall =''
+    export makeFlags="prefix=$out"
+  '';
+
+  buildInputs = [ mesa libX11 openssl libXext libjpeg_turbo ];
+
+  meta = {
+    homepage = http://www.virtualgl.org/;
+    description = "X11 GL rendering in a remote computer with full 3D hw acceleration";
+    license = "free"; # many parts under different free licenses
+  };
+}
diff --git a/pkgs/tools/X11/virtualgl/xshm.patch b/pkgs/tools/X11/virtualgl/xshm.patch
new file mode 100644
index 00000000000..2ca81b559ea
--- /dev/null
+++ b/pkgs/tools/X11/virtualgl/xshm.patch
@@ -0,0 +1,13 @@
+diff --git a/util/fbx.c b/util/fbx.c
+index 06ea835..0d89842 100644
+--- a/util/fbx.c
++++ b/util/fbx.c
+@@ -15,6 +15,8 @@
+ // This library abstracts fast frame buffer access
+ #include <string.h>
+ #include <stdlib.h>
++#include <X11/Xmd.h>
++#include <X11/extensions/shmproto.h>
+ #include "fbx.h"
+ 
+ #define MINWIDTH  160
diff --git a/pkgs/tools/X11/x11vnc/0.9.3.nix b/pkgs/tools/X11/x11vnc/0.9.3.nix
deleted file mode 100644
index b8587ed223f..00000000000
--- a/pkgs/tools/X11/x11vnc/0.9.3.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-args : with args; with builderDefs;
-  let localDefs = builderDefs.passthru.function (rec {
-    src = /* put a fetchurl here */
-    fetchurl {
-      url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz;
-      sha256 = "0sfzkbqd2d94w51czci9w5j5z67amcl1gphgg6x77dyr2h46kc0a";
-    };
-
-    buildInputs = [libXfixes fixesproto openssl libXdamage damageproto
-      zlib libX11 xproto libjpeg libXtst libXinerama xineramaproto
-      libXrandr randrproto libXext xextproto inputproto recordproto libXi
-      libXrender renderproto];
-    configureFlags = [];
-  });
-  in with localDefs;
-stdenv.mkDerivation rec {
-  name = "x11vnc-0.9.3";
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs 
-      [doConfigure doMakeInstall doForceShare doPropagate]);
-  meta = {
-    description = "A VNC server connected to a real X11 screen";
-    homepage = "http://www.karlrunge.com/x11vnc/";
-    inherit src;
-  };
-}
-
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
new file mode 100644
index 00000000000..bc846312835
--- /dev/null
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, openssl, zlib, libjpeg, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "x11vnc-0.9.10";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libvncserver/${name}.tar.gz";
+    sha256 = "04g0da04g4iw0qwvn43a8vh2im4wx9rwl1w41acsbdi8b0amhlck";
+  };
+
+  buildInputs =
+    [ xorg.libXfixes xorg.fixesproto openssl xorg.libXdamage
+      xorg.damageproto zlib xorg.libX11 xorg.xproto libjpeg
+      xorg.libXtst xorg.libXinerama xorg.xineramaproto xorg.libXrandr
+      xorg.randrproto xorg.libXext xorg.xextproto xorg.inputproto
+      xorg.recordproto xorg.libXi xorg.libXrender xorg.renderproto
+    ];
+
+  meta = {
+    description = "A VNC server connected to a real X11 screen";
+    homepage = http://www.karlrunge.com/x11vnc/;
+  };
+}
diff --git a/pkgs/tools/X11/x2vnc/1.7.2.nix b/pkgs/tools/X11/x2vnc/1.7.2.nix
deleted file mode 100644
index c65105e4796..00000000000
--- a/pkgs/tools/X11/x2vnc/1.7.2.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-
-args : with args; with builderDefs.passthru.function {src="";};
-	let localDefs = builderDefs.passthru.function ((rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
-			sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
-		};
-
-		buildInputs = [libX11 xproto xextproto libXext libXrandr randrproto];
-		doCreatePrefix = fullDepEntry (''
-			ensureDir $out
-		'') ["defEnsureDir"];
-		configureFlags = [];
-	}) // args); /* null is a terminator for sumArgs */
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "x2vnc-1.7.2";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doConfigure doCreatePrefix doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "A program to control a remote VNC server";
-		inherit src;
-	};
-}
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
new file mode 100644
index 00000000000..a3d21ab1800
--- /dev/null
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "x2vnc-1.7.2";
+
+  src = fetchurl {
+    url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;
+    sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
+  };
+
+  buildInputs =
+    [ xorg.libX11 xorg.xproto xorg.xextproto xorg.libXext
+      xorg.libXrandr xorg.randrproto
+    ];
+
+  preInstall = "ensureDir $out";
+
+  meta = {
+    homepahe = http://fredrik.hubbe.net/x2vnc.html;
+    description = "A program to control a remote VNC server";
+  };
+}
diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix
index 2c28e986afb..0bc33bcb7fa 100644
--- a/pkgs/tools/X11/xlaunch/default.nix
+++ b/pkgs/tools/X11/xlaunch/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, xorgserver }:
 
 # !!! What does this package do, and does it belong in Nixpkgs?
 
diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/tools/X11/xmacro/default.nix
index c0e3b9ac2f9..1b18138f28b 100644
--- a/pkgs/tools/X11/xmacro/default.nix
+++ b/pkgs/tools/X11/xmacro/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXtst, xextproto, libXi, inputproto }:
 
 stdenv.mkDerivation {
   name = "xmacro-0.3pre20000911";
@@ -8,9 +8,9 @@ stdenv.mkDerivation {
     md5 = "d2956b82f3d5380e58a75ccc721fb746";
   };
 
-  preBuild=" sed -e 's/-pedantic//g' -i Makefile ";
+  preBuild = " sed -e 's/-pedantic//g' -i Makefile ";
 
-  preInstall="echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
+  preInstall = "echo -e 'install:\n	mkdir \${out}/bin;\n	cp xmacrorec xmacrorec2 xmacroplay \${out}/bin;' >>Makefile; ";
 
-  buildInputs = [libX11 libXtst xextproto libXi inputproto];
+  buildInputs = [ libX11 libXtst xextproto libXi inputproto ];
 }
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
new file mode 100644
index 00000000000..f76b86ffcb2
--- /dev/null
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -0,0 +1,82 @@
+{stdenv, fetchsvn, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver,
+autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config,
+fontDirectories, fontutil }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation {
+  name = "tigervnc-svn-4086";
+  src = fetchsvn {
+    url = https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk;
+    rev = 4086;
+    sha256 = "0aqn9d5yz21k5l4mwh5f73il77w2rbvsrz91z3lz4bizivvkwszc";
+  };
+
+  preConfigure = ''
+    autoreconf -vfi
+  '';
+
+  configureFlags = "--enable-nls";
+
+  inherit fontDirectories;
+
+  patchPhase = ''
+    sed -i -e 's,$(includedir)/pixman-1,${pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am
+    sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${xkbcomp}/bin";' unix/vncserver 
+    sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver 
+
+    fontPath=
+    for i in $fontDirectories; do
+      for j in $(find $i -name fonts.dir); do
+        addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j)
+      done
+    done
+    
+    sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver 
+  '';
+
+  # I don't know why I can't use in the script
+  # this:  ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)}
+  xorgPatches = xorgserver.patches;
+
+  postBuild = ''
+    # Build Xvnc
+    tar xf ${xorgserver.src}
+    cp -R xorg*/* unix/xserver
+    pushd unix/xserver
+    for a in $xorgPatches
+    do
+      patch -p1 < $a
+    done
+    patch -p1 < ../xserver18.patch
+    autoreconf -vfi
+    ./configure --prefix=$out --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx
+    make TIGERVNC_SRCDIR=`pwd`/../..
+    popd
+  '';
+
+  # I don't know why I need this; it may have to do with this problem:
+  # http://bugs.gentoo.org/show_bug.cgi?id=142852
+  preInstall = ''
+    sed -i -e s,@MKINSTALLDIRS@,`pwd`/mkinstalldirs, po/Makefile
+  '';
+
+  postInstall = ''
+    pushd unix/xserver
+    make TIGERVNC_SRCDIR=`pwd`/../.. install
+  '';
+
+  buildInputs = [ libX11 libXext gettext libICE libXtst libXi libSM autoconf automake cvs
+    libtool nasm utilmacros fontutil ] ++ xorgserver.buildNativeInputs;
+
+  propagatedBuildInputs = xorgserver.propagatedBuildNativeInputs;
+
+  meta = {
+    homepage = http://www.tigervnc.org/;
+    license = "GPLv2+";
+    description = "Fork of tightVNC, made in cooperation with VirtualGL";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+
+}
diff --git a/pkgs/tools/archivers/cpio/darwin-fix.patch b/pkgs/tools/archivers/cpio/darwin-fix.patch
new file mode 100644
index 00000000000..0e8ff168c52
--- /dev/null
+++ b/pkgs/tools/archivers/cpio/darwin-fix.patch
@@ -0,0 +1,15 @@
+Fix Darwin builds.
+
+From <http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=3a7a1820d4cecbd77c7b74c785af5942510bf080>.
+See also <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00001.html>.
+
+diff --git a/src/filetypes.h b/src/filetypes.h
+index f80faab..81f0c32 100644
+--- a/src/filetypes.h
++++ b/src/filetypes.h
+@@ -81,5 +81,3 @@
+ #ifndef S_ISLNK
+ #define lstat stat
+ #endif
+-int lstat ();
+-int stat ();
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 1700f03d7bd..8e14ff17866 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -1,24 +1,45 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "cpio-2.9";
-  
+stdenv.mkDerivation ({
+  name = "cpio-2.11";
+
   src = fetchurl {
-    url = mirror://gnu/cpio/cpio-2.9.tar.bz2;
-    sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv";
+    url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
+    sha256 = "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv";
   };
 
-  patches = [
-    # Make it compile on GCC 4.3.
-    (fetchurl {
-      name = "cpio-2.9-gnu-inline.patch";
-      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/cpio/files/cpio-2.9-gnu-inline.patch?rev=1.1";
-      sha256 = "1167hrq64h9lh3qhgasm2rivfzkkgx6fik92b017qfa0q61ff8c3";
-    })
-  ];
+  # Tests fail on Darwin, see
+  # <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00012.html> for
+  # details.
+  doCheck = !stdenv.isDarwin;
 
   meta = {
     homepage = http://www.gnu.org/software/cpio/;
-    description = "A program to create or extract from cpio archives";
+    description = "GNU cpio, a program to create or extract from cpio archives";
+
+    longDescription =
+      '' GNU cpio copies files into or out of a cpio or tar archive.  The
+         archive can be another file on the disk, a magnetic tape, or a pipe.
+
+         GNU cpio supports the following archive formats: binary, old ASCII,
+         new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1
+         tar.  The tar format is provided for compatability with the tar
+         program.  By default, cpio creates binary format archives, for
+         compatibility with older cpio programs.  When extracting from
+         archives, cpio automatically recognizes which kind of archive it is
+         reading and can read archives created on machines with a different
+         byte-order.
+      '';
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
+
+//
+
+(if stdenv.isLinux
+ then {}
+ else { patches = [ ./darwin-fix.patch ]; }))
diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index e096313a4c1..49c56d075d3 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -1,18 +1,21 @@
-{stdenv, fetchurl, zlib, bzip2, openssl}:
+{ stdenv, fetchurl, zlib, bzip2, openssl, attr }:
 
 stdenv.mkDerivation rec {
-  name = "dar-2.3.9";
+  name = "dar-2.3.10";
+  
   src = fetchurl {
-    url = "mirror://sourceforge/dar/dar-2.3.9.tar.gz";
-    sha256 = "037ak6wckqyn52000m8bapgnf70rw776dl3s61i9bdq548slq6yc";
+    url = "mirror://sourceforge/dar/${name}.tar.gz";
+    sha256 = "04qzdcz97bzz414khfj82hn8s1i1ry7qxaikq8lj1069gvhc6qjn";
   };
 
-  buildInputs = [zlib bzip2 openssl];
+  buildInputs = [ zlib bzip2 openssl attr ];
+
+  configureFlags = "--disable-dar-static";
 
   meta = {
-	  homepage = http://dar.linux.free.fr/;
-	  description = "Disk ARchiver, allows backing up files into indexed archives";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    homepage = http://dar.linux.free.fr/;
+    description = "Disk ARchiver, allows backing up files into indexed archives";
+    maintainers = [ stdenv.lib.maintainers.viric ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
new file mode 100644
index 00000000000..47de82db158
--- /dev/null
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk
+, notify, pythonDBus, bluez, glib, gtk, libstartup_notification
+, makeWrapper, xdg_utils
+}:
+   
+stdenv.mkDerivation rec {
+  name = "blueman-1.21";
+   
+  src = fetchurl {
+    url = "http://download.tuxfamily.org/blueman/${name}.tar.gz";
+    sha256 = "1bz31w0cqcl77r7vfjwm9c4gmk4hvq3nqn1pjnd5qndia2mhs846";
+  };
+
+  configureFlags = "--disable-polkit";
+
+  buildInputs =
+    [ pkgconfig intltool python pyrex pygobject pygtk notify pythonDBus
+      bluez glib gtk libstartup_notification makeWrapper
+    ];
+
+  # !!! Ugly.
+  PYTHONPATH = "${pygobject}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${notify}/lib/${python.libPrefix}/site-packages/gtk-2.0";
+
+  postInstall =
+    ''
+      # Create wrappers that set the environment correctly.
+      for i in $out/bin/* $out/libexec/*; do
+          wrapProgram $i \
+              --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \
+              --prefix PATH : ${xdg_utils}/bin
+      done
+    ''; # */
+
+  meta = {
+    homepage = http://blueman-project.org/;
+    description = "GTK+-based Bluetooth Manager";
+  };
+}
diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix
new file mode 100644
index 00000000000..c01794b26ba
--- /dev/null
+++ b/pkgs/tools/bluetooth/obex-data-server/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus_glib, bluez, openobex }:
+   
+stdenv.mkDerivation rec {
+  name = "obex-data-server-0.4.5";
+   
+  src = fetchurl {
+    url = "http://tadas.dailyda.com/software/${name}.tar.gz";
+    sha256 = "0qy7mrwr3xfplcxlrq97hiiyda7r9jn24015y9azahi7q5xjfhg7";
+  };
+
+  buildInputs = [ pkgconfig libusb glib dbus_glib bluez openobex ];
+
+  meta = {
+    homepage = http://wiki.muiline.com/obex-data-server;
+  };
+}
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 43691c22714..7ef741753ba 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -1,4 +1,4 @@
-args : with args; with builderDefs;
+{builderDefs}: with builderDefs;
        let localDefs = builderDefs.passthru.function (rec {
          src = /* put a fetchurl here */
            fetchurl {
diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix
new file mode 100644
index 00000000000..4bc9348adbf
--- /dev/null
+++ b/pkgs/tools/filesystems/fusesmb/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, samba, fuse }:
+
+stdenv.mkDerivation rec {
+  name = "fusesmb-0.8.7";
+
+  src = fetchurl {
+    url = "http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/${name}.tar.gz";
+    sha256 = "12gz2gn9iqjg27a233dn2wij7snm7q56h97k6gks0yijf6xcnpz1";
+  };
+
+  buildInputs = [ samba fuse ];
+
+  postInstall =
+    ''
+      ensureDir $out/lib
+      ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
+    '';
+
+  meta = {
+    description = "Samba mounted via FUSE";
+    homepage = http://www.ricardis.tudelft.nl/~vincent/fusesmb/;
+  };
+}
diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix
new file mode 100644
index 00000000000..afa4be345a9
--- /dev/null
+++ b/pkgs/tools/filesystems/httpfs/default.nix
@@ -0,0 +1,35 @@
+{ fetchurl, stdenv, pkgconfig, fuse, openssl, asciidoc
+, docbook_xml_dtd_45, docbook_xsl , libxml2, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "httpfs2-0.1.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/httpfs/httpfs2/${name}.tar.gz";
+    sha256 = "0vlp6i119lz4ybnrd26hvvwms3h5d7x3jly5nzyyfcw24ngvpk7p";
+  };
+
+  buildInputs =
+    [ pkgconfig fuse openssl
+      asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
+    ];
+
+  installPhase =
+    '' ensureDir "$out/bin"
+       cp -v httpfs2 "$out/bin"
+
+       ensureDir "$out/share/man/man1"
+       cp -v *.1 "$out/share/man/man1"
+    '';
+
+  meta = {
+    description = "HTTPFS2, a FUSE-based HTTP file system for Linux";
+
+    homepage = http://httpfs.sourceforge.net/;
+
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix
index f036e0a08bc..7cadc0dd649 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -1,18 +1,24 @@
-args: with args;
+{ stdenv, fetchurl, libuuid }:
 
-stdenv.mkDerivation {
-  name = "reiserfsprogs-3.6.19-patched";
+stdenv.mkDerivation rec {
+  name = "reiserfsprogs-3.6.21";
 
   src = fetchurl {
-    url = http://chichkin_i.zelnet.ru/namesys/reiserfsprogs-3.6.19.tar.gz;
-    sha256 = "1gv8gr0l5l2j52540y2wj9c9h7fn0r3vabykf95748ydmr9jr1n0";
+    url = "http://www.kernel.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2";
+    sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam";
   };
 
-  patches = [./headers-fix.patch ./verbose-flag-ignore-for-compatibility.patch ];
+  buildInputs = [ libuuid ];
+
+  postInstall =
+    ''
+      ln -s reiserfsck $out/sbin/fsck.reiserfs
+      ln -s mkreiserfs $out/sbin/mkfs.reiserfs
+    '';
 
   meta = {
     homepage = http://www.namesys.com/;
-    description = "Reiserfs utilities";
+    description = "ReiserFS utilities";
     license = "GPL-2";
   };
 }
diff --git a/pkgs/tools/filesystems/reiserfsprogs/headers-fix.patch b/pkgs/tools/filesystems/reiserfsprogs/headers-fix.patch
deleted file mode 100644
index 2c6693dae75..00000000000
--- a/pkgs/tools/filesystems/reiserfsprogs/headers-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -pruN 1:3.6.19-4/include/reiserfs_fs.h 1:3.6.19-4ubuntu2/include/reiserfs_fs.h
---- 1:3.6.19-4/include/reiserfs_fs.h	2004-09-16 08:49:05.000000000 +0100
-+++ 1:3.6.19-4ubuntu2/include/reiserfs_fs.h	2006-12-14 18:08:28.000000000 +0000
-@@ -38,15 +38,10 @@
- # define extern_inline
- #endif
- 
--#include <asm/unaligned.h>
--
- #ifndef get_unaligned
--#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
--    defined(__PPC) || defined(powerpc) || defined(__powerpc__)
- #	define get_unaligned(ptr)	(*(ptr))
- #	define put_unaligned(val,ptr)	((void)(*(ptr) = (val)))
- #endif
--#endif
- 
- #define get_leXX(xx,p,field)	(le##xx##_to_cpu ((p)->field))
- #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0)
diff --git a/pkgs/tools/filesystems/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch b/pkgs/tools/filesystems/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch
deleted file mode 100644
index 802971b73fd..00000000000
--- a/pkgs/tools/filesystems/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/fsck/main.c b/fsck/main.c
-index ab3342a..79a0473 100644
---- a/fsck/main.c
-+++ b/fsck/main.c
-@@ -37,6 +37,7 @@ fsck_progress ("Usage: %s [mode] [options] "					\
- "  -z | --adjust-size\t\tfix file sizes to real size\n"				\
- "  -q | --quiet\t\t\tno speed info\n"						\
- "  -y | --yes\t\t\tno confirmations\n"						\
-+"  -v         \t\t ignore -v option for compatibility to fsck.* tools\n"						\
- "  -V\t\t\t\tprints version and exits\n"					\
- "  -a and -p\t\t\tsome light-weight auto checks for bootup\n"			\
- "  -f and -r\t\t\tignored\n"							\
-@@ -131,7 +132,7 @@ static char * parse_options (struct fsck_data * data, int argc, char * argv [])
- 	};
- 	int option_index;
-       
--	c = getopt_long (argc, argv, "iql:nb:Szd:R:h:j:gafVrpyt:B:",
-+	c = getopt_long (argc, argv, "iql:nb:Szd:R:h:j:gafVrpyvt:B:",
- 			 options, &option_index);
- 	if (c == -1)
- 	    break;
-@@ -158,6 +159,10 @@ static char * parse_options (struct fsck_data * data, int argc, char * argv [])
- 	    data->options |= OPT_YES;
- 	    break;
- 
-+	case 'v': /* --quiet */
-+            reiserfs_warning(stdout, "\nignoring -v option for compatibility\n");
-+	    break;
-+
- 	case 'l': /* --logfile */
- 	    data->log_file_name = optarg;
- 	    /*asprintf (&data->log_file_name, "%s", optarg);*/
diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix
index 178aa700fa5..2eb8e3a0b3b 100644
--- a/pkgs/tools/filesystems/relfs/default.nix
+++ b/pkgs/tools/filesystems/relfs/default.nix
@@ -1,8 +1,8 @@
+{ stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre
+, libuuid, gnomevfs, pkgconfig, GConf }:
 
-args : with args;
 	let localDefs = builderDefs.passthru.function {
-	src = /* put a fetchurl here */
-	if args ? src then args.src else fetchcvs {
+	src = fetchcvs {
 		cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
 		module = "relfs";
 		date = "2008-03-05";
@@ -40,7 +40,7 @@ args : with args;
 	};
 	in with localDefs;
 
-assert args.libuuid != null;
+assert libuuid != null;
         
 stdenv.mkDerivation rec {
 	name = "relfs-2008.03.05";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 	meta = {
 		description = "A relational filesystem on top of FUSE";
 		inherit src;
-    		maintainers = [args.stdenv.lib.maintainers.raskin];
-		platforms = args.stdenv.lib.platforms.linux;
+    		maintainers = [stdenv.lib.maintainers.raskin];
+		platforms = stdenv.lib.platforms.linux;
 	};
 }
diff --git a/pkgs/tools/filesystems/smbfs-fuse/default.nix b/pkgs/tools/filesystems/smbfs-fuse/default.nix
deleted file mode 100644
index 4b656b70388..00000000000
--- a/pkgs/tools/filesystems/smbfs-fuse/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-0.8.7.tar.gz;
-			sha256 = "12gz2gn9iqjg27a233dn2wij7snm7q56h97k6gks0yijf6xcnpz1";
-		};
-
-		buildInputs = [samba fuse];
-		configureFlags = [];
-		postInstall = fullDepEntry 
-		(''
-		ensureDir $out/lib
-		ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0
-		'')
-		[ "minInit" "defEnsureDir" "doMakeInstall"];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "smbfs-fuse-0.8.7";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doConfigure doMakeInstall postInstall doForceShare doPropagate]);
-  meta = {
-   description = "Samba mounted via FUSE";
-   inherit src;
-  };
-}
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index e72f96ea85e..0e5131b603d 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -2,15 +2,15 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "0.6" a; 
+  version = a.lib.attrByPath ["version"] "1.0" a; 
   buildInputs = with a; [
     cmake imagemagick patchelf
   ];
 in
 rec {
   src = fetchurl {
-    url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-${version}.tar.bz2";
-    sha256 = "0jgiccimwv1aqp9gzl9937gdlh9zl5qpaygf0n1xcbfd5aqz14ig";
+    url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.0.tar.bz2";
+    sha256 = "bfa7acc6aade966ab62bc0f19e0ac1a843b659a70202229570c087ca8b15f39e";
   };
 
   inherit buildInputs;
@@ -29,7 +29,7 @@ rec {
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
       
   postInstall = a.fullDepEntry(''
-    patchelf --set-rpath $out/lib${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""} $out/bin/cuneiform
+    patchelf --set-rpath $out/lib${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""}:${a.imagemagick}/lib $out/bin/cuneiform
   '') ["minInit" "addInputs" "doMakeInstall"];
 
   name = "cuneiform-" + version;
diff --git a/pkgs/tools/graphics/gifscile/default.nix b/pkgs/tools/graphics/gifscile/default.nix
deleted file mode 100644
index 31f7a4e4527..00000000000
--- a/pkgs/tools/graphics/gifscile/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args:
-args.stdenv.mkDerivation {
-  name = "gifsicle-1.52";
-
-  src = args.fetchurl {
-    url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz;
-    sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk";
-  };
-
-  buildInputs =(with args; [xproto libXt libX11]);
-
-  meta = { 
-      description = "command-line tool for creating, editing, and getting information about GIF images and animations";
-      homepage = http://www.lcdf.org/gifsicle/;
-      license = "GPL2";
-  };
-}
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
new file mode 100644
index 00000000000..515858bd439
--- /dev/null
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, xproto, libXt, libX11 }:
+
+stdenv.mkDerivation {
+  name = "gifsicle-1.52";
+
+  src = fetchurl {
+    url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz;
+    sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk";
+  };
+
+  buildInputs = [ xproto libXt libX11 ];
+
+  meta = { 
+    description = "Command-line tool for creating, editing, and getting information about GIF images and animations";
+    homepage = http://www.lcdf.org/gifsicle/;
+    license = "GPL2";
+  };
+}
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 8a055d274c9..d1978134a71 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, x11, mesa}:
 
 stdenv.mkDerivation {
-  name = "glxinfo-7.4.1";
+  name = "glxinfo-7.8.2";
   
   src = fetchurl {
-    url = mirror://sourceforge/mesa3d/MesaDemos-7.4.1.tar.bz2;
-    md5 = "1e169fb6abc2b45613f1c98a82dfe690";
+    url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaDemos-7.8.2.tar.bz2;
+    md5 = "757d9e2e06f48b1a52848be9b0307ced";
   };
 
   buildInputs = [x11 mesa];
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 003169415d3..105cccea3d9 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -15,15 +15,16 @@
 
 stdenv.mkDerivation {
   name = "gnuplot-4.4.0";
+  
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/gnuplot-4.4.0.tar.gz";
     sha256 = "0akb2lzxa3b0j4nr6anr0mhsk10b1fcnixk8vk9aa82rl1a2rph0";
   };
 
-  configureFlags = if (libX11 != null) then ["--with-x"] else ["--without-x"];
+  configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"];
 
-  buildInputs = [
-    zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
-    wxGTK pango cairo pkgconfig
-  ];
+  buildInputs =
+    [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
+      wxGTK pango cairo pkgconfig
+    ];
 }
diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix
new file mode 100644
index 00000000000..07fbbc967d9
--- /dev/null
+++ b/pkgs/tools/graphics/graphviz/2.0.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw
+, yacc, libtool, fontconfig, pango, gd
+}:
+
+assert libpng != null && libjpeg != null && expat != null;
+
+stdenv.mkDerivation rec {
+  name = "graphviz-2.0";
+
+  src = fetchurl {
+    url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz";
+    sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
+  };
+
+  buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
+  
+  configureFlags =
+    [ "--with-pngincludedir=${libpng}/include"
+      "--with-pnglibdir=${libpng}/lib"
+      "--with-jpegincludedir=${libjpeg}/include"
+      "--with-jpeglibdir=${libjpeg}/lib"
+      "--with-expatincludedir=${expat}/include"
+      "--with-expatlibdir=${expat}/lib"
+    ]
+    ++ stdenv.lib.optional (x11 == null) "--without-x";
+
+  meta = {
+    description = "A program for visualising graphs";
+    homepage = http://www.graphviz.org/;
+  };
+}
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index 6f4a41d2425..b3d75106980 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, ghostscript, gd, zlib, plotutils }:
+
 stdenv.mkDerivation {
   name = "pstoedit-3.50";
 
@@ -7,14 +8,13 @@ stdenv.mkDerivation {
     sha256 = "04ap21fxj2zn6vj9mv7zknj4svcbkb1gxwfzxkw5i0sksx969c92";
   };
 
-  buildInputs = [pkgconfig ghostscript gd zlib plotutils];
+  buildInputs = [ pkgconfig ghostscript gd zlib plotutils ];
 
   meta = { 
     description = "translates PostScript and PDF graphics into other vector formats";
     homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit;
     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/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix
index f91a3fabc32..024798a84e3 100644
--- a/pkgs/tools/misc/bfr/default.nix
+++ b/pkgs/tools/misc/bfr/default.nix
@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation {
   name = "bfr-1.6";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.glines.org/bin/pk/bfr-1.6.tar.bz2;
     sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy";
   };
 
-  buildInputs =(with args; [perl]);
+  buildInputs = [ perl ];
 
   meta = {
-      description = "general-purpose command-line pipe buffer";
-      homepage = http://www.glines.org/wiki/bfr;
-      license = "GPL2";
+    description = "general-purpose command-line pipe buffer";
+    homepage = http://www.glines.org/wiki/bfr;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix
new file mode 100644
index 00000000000..c49e25a4dc5
--- /dev/null
+++ b/pkgs/tools/misc/convmv/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "convmv-1.14";
+
+  src = fetchurl {
+    url = "http://www.j3e.de/linux/convmv/${name}.tar.gz";
+    sha256 = "1vvwrbys5kkfpn6kvn0sj3hls5v03d6gr7j7d5phbj8p9bigb5cn";
+  };
+
+  preBuild=''
+    makeFlags="PREFIX=$out"
+  '';
+
+  patchPhase=''
+    tar -xf testsuite.tar
+    patchShebangs .
+  '';
+
+  doCheck = true;
+  checkTarget = "test";
+
+  buildInputs = [ perl ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.all;
+    maintainers = [ maintainers.urkud ];
+  };
+}
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 447c69b22e1..53027246b7f 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,24 +1,29 @@
-args: with args;
+{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget }:
 
-let devices = fetchurl {
+let
+
+  devices = fetchurl {
     url = mirror://gentoo/distfiles/devices.tar.gz;
     sha256 = "0j4yhajmlgvbksr2ij0dm7jy3q52j3wzhx2fs5lh05i1icygk4qd";
   };
+  
 in
 
 stdenv.mkDerivation {
-  name = "debotstrap-1.0.10lenny";
+  name = "debootstrap-1.0.10lenny";
 
   src = fetchurl {
     # I'd like to use the source. However it's lacking the lanny script ?
     url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.10lenny1_all.deb;
     sha256 = "a70af8e3369408ce9d6314fb5219de73f9523b347b75a3b07ee17ea92c445051";
   };
-  buildInputs = [dpkg gettext gawk perl];
+  
+  buildInputs = [ dpkg gettext gawk perl ];
 
   unpackPhase = ''
     dpkg-deb --extract "$src" .
   '';
+  
   buildPhase = ":";
 
   patches = [
@@ -80,12 +85,10 @@ stdenv.mkDerivation {
   */
 
   meta = { 
-    description = "create a debian system in a chroot easily.";
-    longDescription = "this way you can use debian packages we don't have in nixpkgs yet.
-      ";
+    description = "Tool to create a Debian system in a chroot";
     homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
     license = "GPL-2"; # gentoo says so.. ?
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/eProver/default.nix b/pkgs/tools/misc/eProver/default.nix
index 30353e122c1..ff92b235e09 100644
--- a/pkgs/tools/misc/eProver/default.nix
+++ b/pkgs/tools/misc/eProver/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, which, texLive }:
 
 stdenv.mkDerivation {
   name = "EProver-0.999";
diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix
index b42919430dd..00265d1f31d 100644
--- a/pkgs/tools/misc/figlet/default.nix
+++ b/pkgs/tools/misc/figlet/default.nix
@@ -1,22 +1,22 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "figlet-222";
 
   # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/
-  src = args.fetchurl {
+  src = fetchurl {
     url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet222.tar.gz;
     sha256 = "1y22hhwxhnwd6yrjgl5p3p44r22xzrhv9cksj58n85laac6jdfhs";
   };
 
-  buildInputs =(with args; []);
   preConfigure = ''
     ensureDir $out/{man/man6,bin}
     makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet"
   '';
 
   meta = { 
-      description="program for making large letters out of ordinary text";
-      homepage = http://www.figlet.org/;
-      license = "AFL-2.1";
+    description = "Program for making large letters out of ordinary text";
+    homepage = http://www.figlet.org/;
+    license = "AFL-2.1";
   };
 }
diff --git a/pkgs/tools/misc/findutils-wrapper/builder.sh b/pkgs/tools/misc/findutils-wrapper/builder.sh
deleted file mode 100644
index 6fc2eacd9c1..00000000000
--- a/pkgs/tools/misc/findutils-wrapper/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-makeWrapper "$findutils/bin/locate" "$out/bin/locate" \
---set LOCATE_PATH /var/locatedb
-
-makeWrapper "$findutils/bin/updatedb" "$out/bin/updatedb" \
---set LOCATE_DB /var/locatedb
-
-makeWrapper "$findutils/bin/find" "$out/bin/find"
-
-makeWrapper "$findutils/bin/xargs" "$out/bin/xargs"
diff --git a/pkgs/tools/misc/findutils-wrapper/default.nix b/pkgs/tools/misc/findutils-wrapper/default.nix
deleted file mode 100644
index cc9aa7acf63..00000000000
--- a/pkgs/tools/misc/findutils-wrapper/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, findutils}:
-
-stdenv.mkDerivation {
-  name = findutils.name;
-
-  builder = ./builder.sh;
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-
-  inherit findutils;
-}
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index b9532510411..9402fad2287 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, gettext, freetype, zlib
 , libungif, libpng, libjpeg, libtiff, libxml2
+, withX11 ? false
 , libX11 ? null, lib, xproto ? null, libXt ? null
 }:
 
 let 
   version = "20090408";
   name = "fontforge-${version}";
-  in
+in
 
 stdenv.mkDerivation {
   inherit name;
@@ -16,7 +17,7 @@ stdenv.mkDerivation {
     sha256 = "1s9a1mgbr5sv5jx6rdj2v3p6s52hgjr9wqd1aq57kn9whc8ny8y4";
   };
     
-  configureFlags = if libX11 != null then "--with-gui=gdraw" else "";
+  configureFlags = lib.optionalString withX11 "--with-gui=gdraw";
   
   preConfigure = ''
     unpackFile ${freetype.src}
@@ -30,9 +31,6 @@ stdenv.mkDerivation {
   '';
 
   buildInputs =
-    [gettext freetype zlib libungif libpng libjpeg libtiff libxml2]
-    ++ lib.optional (libX11 != null) libX11
-    ++ lib.optional (xproto != null) xproto
-    ++ lib.optional (libXt != null) libXt
-    ;
+    [ gettext freetype zlib libungif libpng libjpeg libtiff libxml2 ]
+    ++ lib.optionals withX11 [ libX11 xproto libXt ];
 }
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index df805c10698..5cc8d54f393 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid
+, pkgconfig, gtkmm, gnomedocutils, libxml2 }:
+
 stdenv.mkDerivation {
   name = "gparted-0.5.1";
 
@@ -9,12 +11,14 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-doc";
 
-  buildInputs = [parted gtk glib intltool gettext libuuid pkgconfig
-    gtkmm gnomedocutils libxml2];
+  buildInputs =
+    [ parted gtk glib intltool gettext libuuid pkgconfig gtkmm
+      gnomedocutils libxml2
+    ];
 
   meta = { 
-      description = "gui partition tool";
-      homepage = http://gparted.sourceforge.net;
-      license = "GPLv2";
+    description = "Graphical disk partitioning tool";
+    homepage = http://gparted.sourceforge.net;
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/1.9x.nix
index b57a98dd5ba..25d56c28511 100644
--- a/pkgs/tools/misc/grub/1.9x.nix
+++ b/pkgs/tools/misc/grub/1.9x.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, bison, ncurses, libusb, freetype }:
+{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }:
 
 let unifont_bdf = fetchurl {
       url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -7,14 +7,34 @@ let unifont_bdf = fetchurl {
 in
 
 stdenv.mkDerivation rec {
-  name = "grub-1.97.2";
+  name = "grub-1.98";
 
   src = fetchurl {
     url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";
-    sha256 = "0j8wdaq9r0ayfsz25lbq2k3q0iasq5cyldlip8jyq2g87iid5hcq";
+    sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy";
   };
 
-  buildInputs = [ bison ncurses libusb freetype ];
+  buildInputs = [ bison ncurses libusb freetype gettext ]
+    ++ stdenv.lib.optional doCheck qemu;
+
+  preConfigure =
+    '' for i in "tests/util/"*.in
+       do
+         sed -i "$i" -e's|/bin/bash|/bin/sh|g'
+       done
+
+       # Apparently, the QEMU executable is no longer called
+       # `qemu-system-i386', even on i386.
+       #
+       # In addition, use `-nodefaults' to avoid errors like:
+       #
+       #  chardev: opening backend "stdio" failed
+       #  qemu: could not open serial device 'stdio': Invalid argument
+       #
+       # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
+       sed -i "tests/util/grub-shell.in" \
+           -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
+    '';
 
   patches =
     [ # The udev rules for LVM create symlinks in /dev/mapper rathe
@@ -32,7 +52,7 @@ stdenv.mkDerivation rec {
            -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
     '';
 
-  doCheck = true;
+  doCheck = false;
 
   meta = {
     description = "GNU GRUB, the Grand Unified Boot Loader (2.x alpha)";
diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix
index 9f285a6cd51..202d28684d0 100644
--- a/pkgs/tools/misc/hddtemp/default.nix
+++ b/pkgs/tools/misc/hddtemp/default.nix
@@ -1,25 +1,28 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "hddtemp-0.3-beta15";
 
   db = fetchurl{
-              url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
-              sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
-       };
+    url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
+    sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
+  };
+  
   src = fetchurl {
-            url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
-            sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
+    url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
+    sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
   };
 
-  configurePhase = "
-    ensureDir \$out/nix-support
-    cp \$db \$out/nix-support/hddtemp.db
-    ./configure --prefix=\$out --with-db-path=\$out/nix-support/hddtemp.db
-  "; 
+  configurePhase =
+    ''
+      ensureDir $out/nix-support
+      cp $db $out/nix-support/hddtemp.db
+      ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db
+    ''; 
 
   meta = { 
-      description = "shows the harddisk temperature";
-      homepage = https://savannah.nongnu.org/projects/hddtemp/;
-      license = "GPL2";
+    description = "Tool for displaying hard disk temperature";
+    homepage = https://savannah.nongnu.org/projects/hddtemp/;
+    license = "GPL2";
   };
 }
diff --git a/pkgs/tools/misc/hdf5/bin-mv.patch b/pkgs/tools/misc/hdf5/bin-mv.patch
new file mode 100644
index 00000000000..45649977e56
--- /dev/null
+++ b/pkgs/tools/misc/hdf5/bin-mv.patch
@@ -0,0 +1,30 @@
+diff -rc hdf5-1.8.5/configure hdf5-1.8.5-new/configure
+*** hdf5-1.8.5/configure	2010-06-04 20:26:04.000000000 +0200
+--- hdf5-1.8.5-new/configure	2010-08-02 10:30:26.000000000 +0200
+***************
+*** 30587,30598 ****
+    sed 's/#define /#define H5_/' <src/H5config.h |\
+      sed 's/#undef /#undef H5_/' >pubconf
+    if test ! -f src/H5pubconf.h; then
+!     /bin/mv -f pubconf src/H5pubconf.h
+    elif (diff pubconf src/H5pubconf.h >/dev/null); then
+      rm -f pubconf
+      echo "src/H5pubconf.h is unchanged"
+    else
+!     /bin/mv -f pubconf src/H5pubconf.h
+    fi
+    echo "Post process src/libhdf5.settings"
+    sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP
+--- 30587,30598 ----
+    sed 's/#define /#define H5_/' <src/H5config.h |\
+      sed 's/#undef /#undef H5_/' >pubconf
+    if test ! -f src/H5pubconf.h; then
+!     mv -f pubconf src/H5pubconf.h
+    elif (diff pubconf src/H5pubconf.h >/dev/null); then
+      rm -f pubconf
+      echo "src/H5pubconf.h is unchanged"
+    else
+!     mv -f pubconf src/H5pubconf.h
+    fi
+    echo "Post process src/libhdf5.settings"
+    sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
new file mode 100644
index 00000000000..e21b3945552
--- /dev/null
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -0,0 +1,25 @@
+
+{ stdenv
+, fetchurl
+}:
+stdenv.mkDerivation {
+  name = "hdf5";
+  src = fetchurl {
+    url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5.tar.gz ;
+    sha256 = "0nykbpxg154akgp6va6fkab7kjvybbvpsr7n7i1l8xxmv3h3hbsa";  			
+  };
+  buildInputs = [] ;
+  
+  patches = [./bin-mv.patch];
+  
+  meta = {
+    description = "HDF5 is a data model, library, and file format for storing and managing data.";
+    longDescription = ''
+      It supports an unlimited variety of datatypes, and is designed for flexible and efficient 
+      I/O and for high volume and complex data. HDF5 is portable and is extensible, allowing 
+      applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and 
+      applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
+    '';
+    homepage = http://www.hdfgroup.org/HDF5/;
+  };
+}
diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix
index a1ed9e9e449..00541c05339 100644
--- a/pkgs/tools/misc/idutils/default.nix
+++ b/pkgs/tools/misc/idutils/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, emacs }:
 
 stdenv.mkDerivation rec {
-  name = "idutils-4.2";
+  name = "idutils-4.5";
   
   src = fetchurl {
     url = "mirror://gnu/idutils/${name}.tar.gz";
-    sha256 = "16gsy7vrjax2zl4galwq03l0y97d18p0pyd5cccyc4i8y3mhwx65";
+    sha256 = "0j92k2dwg381kx2z556v9162l16mfra3xqbfcjrkdd2fw5jsgn2q";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isLinux emacs;
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://www.gnu.org/software/idutils/;
-    license = "GPLv2+";
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/misc/idutils/nix-mapping.patch b/pkgs/tools/misc/idutils/nix-mapping.patch
index 43e7439e2f6..6f92ffa07b5 100644
--- a/pkgs/tools/misc/idutils/nix-mapping.patch
+++ b/pkgs/tools/misc/idutils/nix-mapping.patch
@@ -1,10 +1,12 @@
-diff --git a/libidu/id-lang.map b/libidu/id-lang.map
-index 7edb860..6dccd28 100644
---- a/libidu/id-lang.map
-+++ b/libidu/id-lang.map
-@@ -92,3 +92,5 @@ Makefile.*		make
- 
- *.gz			FILTER gzip -d <%s
- *.Z			FILTER gzip -d <%s
-+
+Recognize `.nix' files as text files.
+
+--- idutils-4.5/libidu/id-lang.map	2009-05-17 16:38:42.000000000 +0200
++++ idutils-4.5/libidu/id-lang.map	2010-07-04 15:52:48.000000000 +0200
+@@ -88,6 +88,7 @@ GNUmakefile		make
+ *.doc			text
+ *.txt			text
+ *.org			text
 +*.nix			text
+ 
+ *.m4			m4
+ *.ac			m4
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix
index 54c50c15d23..36b29083e08 100644
--- a/pkgs/tools/misc/keychain/default.nix
+++ b/pkgs/tools/misc/keychain/default.nix
@@ -1,24 +1,24 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "keychain-2.6.6";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://gentoo.chem.wisc.edu/gentoo/distfiles/keychain-2.6.6.tar.bz2;
     sha256 = "10v0hzkgrb5cazm1gk0g4ncwp8sqvfk7xfyx59cjd69kzhbbn6ic";
   };
 
   phases = "unpackPhase buildPhase";
 
-  buildPhase ="
-    mkdir -p \$out/bin
-    cp keychain \$out/bin
-  ";
-
-  buildInputs =(with args; []);
+  buildPhase =
+    ''
+      mkdir -p $out/bin
+      cp keychain $out/bin
+    '';
 
   meta = { 
-      description = "tool starting ssh and gpg management tool";
-      homepage = "http://www.gentoo.org/proj/en/keychain/";
-      license = "GPL2";
+    description = "Keychain management tool";
+    homepage = "http://www.gentoo.org/proj/en/keychain/";
+    license = "GPL2";
   };
 }
diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix
index 77ea33dc1e9..5d93ef44b36 100644
--- a/pkgs/tools/misc/mysql2pgsql/default.nix
+++ b/pkgs/tools/misc/mysql2pgsql/default.nix
@@ -1,16 +1,17 @@
-args:
+{ stdenv, fetchurl, perl, shebangfix }:
+
 # The homepage says this script is mature..
-args.stdenv.mkDerivation {
+stdenv.mkDerivation {
   name = "mysql2pgsql-0.0.1a";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz;
     sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp";
   };
 
   phases = "unpackPhase installPhase";
 
-  buildInputs = with args; [ perl shebangfix ];
+  buildInputs = [ perl shebangfix ];
 
   installPhase = ''
     mkdir -p $out/bin;
@@ -20,8 +21,8 @@ args.stdenv.mkDerivation {
   '';
 
   meta = { 
-      description = "converts mysql dump files to psql loadable files ";
-      homepage = http://pgfoundry.org/projects/mysql2pgsql/;
-      license = "GPL";
+    description = "converts mysql dump files to psql loadable files ";
+    homepage = http://pgfoundry.org/projects/mysql2pgsql/;
+    license = "GPL";
   };
 }
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 2526606adc2..f2223d5ce3e 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20100424";
+  name = "parallel-20100620";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0japyn4n044zpd88czsrfh4lyjmckih25jl671vby8v5mhk42vw4";
+    sha256 = "1hzdzvkm5cqciy6lhcbdzi4aar09fgsf0lfb4a89mnlq4xdmr8jj";
   };
 
   patchPhase =
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 7e91873b46a..c4061949424 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -2,11 +2,11 @@
 , utillinuxng, xz }:
 
 stdenv.mkDerivation rec {
-  name = "parted-2.2";
+  name = "parted-2.3";
 
   src = fetchurl {
     url = "mirror://gnu/parted/${name}.tar.xz";
-    sha256 = "13gxq542lsm5jfq0kmrwgk4h61pcxy8s6rkqlw9qirqazsk9q9ik";
+    sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836";
   };
 
   buildInputs = [ xz libuuid gettext readline libuuid devicemapper ];
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index 20f88acaed7..fd8abf7caf3 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,4 +1,4 @@
-args: with args; with kde;
+{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt, kde, perl }:
 
 stdenv.mkDerivation {
   name = "partitionmanager-1.0.0";
@@ -8,8 +8,8 @@ stdenv.mkDerivation {
     sha256 = "03ibn4vns7pa0ygkp2jh6zcdy106as5cc7p6rv1f5c15wxx0zsk1";
   };
 
-  buildInputs = [cmake gettext parted libuuid
-      qt kdelibs kdebase automoc4 perl phonon];
+  buildInputs =
+    [ cmake gettext parted libuuid qt kde.kdelibs kde.kdebase kde.automoc4 perl kde.phonon ];
 
   preConfigure = ''
     export VERBOSE=1
@@ -25,10 +25,9 @@ stdenv.mkDerivation {
   '';
 
   meta = { 
-    description = "utility program to help you manage the disk devices";
+    description = "Utility program to help you manage the disk devices";
     homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ?
     license = "GPL";
-    #maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix
index f587437b5da..f5be7b8a46d 100644
--- a/pkgs/tools/misc/proxytunnel/default.nix
+++ b/pkgs/tools/misc/proxytunnel/default.nix
@@ -1,19 +1,20 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, openssl }:
+
+stdenv.mkDerivation {
   name = "proxytunnel-1.9.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz;
     sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f";
   };
 
-  buildInputs =(with args; [openssl]);
+  buildInputs = [ openssl ];
 
-  installPhase=''make DESTDIR="$out" PREFIX="" install'';
+  installPhase = ''make DESTDIR="$out" PREFIX="" install'';
 
   meta = {
-      description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
-      homepage = http://proxytunnel.sourceforge.net/download.php;
-      license = "GPLv2";
+    description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
+    homepage = http://proxytunnel.sourceforge.net/download.php;
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/misc/rlwrap/0.28.nix b/pkgs/tools/misc/rlwrap/0.28.nix
deleted file mode 100644
index 1b9bbb995ac..00000000000
--- a/pkgs/tools/misc/rlwrap/0.28.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz;
-			sha256 = "07jzhcqzb8jsmsscc28dk4md7swnhn3vyai5fpxwdj6a1kbn4y3p";
-		};
-
-		buildInputs = [readline ];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "rlwrap-0.28";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			[doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Readline wrapper for console programs";
-		inherit src;
-	};
-}
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
new file mode 100644
index 00000000000..7402209960d
--- /dev/null
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, readline }:
+
+stdenv.mkDerivation rec {
+  name = "rlwrap-0.37";
+
+  src = fetchurl {
+    url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz";
+    sha256 = "1gcb95i839pwn9a3phs2wq7bwz9f6v8sydq6lf9y4gm3hk0s40w4";
+  };
+
+  buildInputs = [ readline ];
+
+  meta = {
+    description = "Readline wrapper for console programs";
+    homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/;
+  };
+}
diff --git a/pkgs/tools/misc/shebangfix/default.nix b/pkgs/tools/misc/shebangfix/default.nix
index ca4a0004d19..082b04b95d7 100644
--- a/pkgs/tools/misc/shebangfix/default.nix
+++ b/pkgs/tools/misc/shebangfix/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, perl }:
+
 stdenv.mkDerivation {
   name = "shebangfix-0.0";
 
diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix
index cc9f1f6f0dc..c861fc6f73a 100644
--- a/pkgs/tools/misc/slsnif/default.nix
+++ b/pkgs/tools/misc/slsnif/default.nix
@@ -1,17 +1,16 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "slsnif-0.4.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz;
     sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "serial line sniffer";
-      homepage = http://slsnif.sourceforge.net/;
-      license = "GPLv2";
+    description = "Serial line sniffer";
+    homepage = http://slsnif.sourceforge.net/;
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index e92b5a1cd2b..4fae21250ca 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -1,6 +1,8 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
 
   name = "timidity-2.13.0";
 
@@ -9,8 +11,6 @@ composableDerivation {} {
     sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf";
   };
 
-  buildInputs = [];
-
   mergeAttrBy.audioModes = a : b : "${a},${b}";
 
   preConfigure = ''
@@ -57,7 +57,6 @@ composableDerivation {} {
 
   meta = {
     description = "A software MIDI renderer";
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
   };
-
 }
diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix
index 870c5b1e121..c112afaee0f 100644
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/pkgs/tools/misc/ttf2pt1/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, perl, freetype }:
+
 stdenv.mkDerivation {
   name = "ttf2pt1-3.4.4";
 
@@ -17,12 +18,13 @@ stdenv.mkDerivation {
     makeFlags="INSTDIR=$out OWNER=`id -u`"
   '';
 
-  buildInputs = [freetype];
+  buildInputs = [ freetype ];
+  
   patches = ./gentoo-makefile.patch; # also contains the freetype patch
 
   meta = { 
-      description = "True Type to Postscript Type 3 converter, fpdf";
-      homepage = "http://ttf2pt1.sourceforge.net/index.html";
-      license = "ttf2pt1";
+    description = "True Type to Postscript Type 3 converter, fpdf";
+    homepage = "http://ttf2pt1.sourceforge.net/index.html";
+    license = "ttf2pt1";
   };
 }
diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix
index dd4e8bbfd9a..93231397feb 100644
--- a/pkgs/tools/misc/w3c-css-validator/default.nix
+++ b/pkgs/tools/misc/w3c-css-validator/default.nix
@@ -1,11 +1,9 @@
-args: with args;
+{ stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }:
 
 let 
 
-    inherit (args.stdenv) lib;
-
-    sources = [
-      (fetchurl {
+  sources =
+    [ (fetchurl {
         name = "jigsaw_2.2.6.tar.gz";
         url="http://jigsaw.w3.org/Distrib/jigsaw_2.2.6.tar.gz";
         sha256 = "01cjpqjcs8gbvvzy0f488cb552f9b38hvwr97wydglrzndmcwypd";
@@ -20,7 +18,6 @@ let
         url="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.4-bin.tar.gz";
         sha256 = "0phwlgnvwj3n3j1aka2pkm0biacvgs72qc0ldir6s69i9qbv7rh0";
       })
-
       (fetchurl {
         name = "velocity-1.6.1.tar.gz";
         url="http://www.apache.org/dist/velocity/engine/1.6.1/velocity-1.6.1.tar.gz";
@@ -35,7 +32,7 @@ let
 
 in
 
-stdenv.mkDerivation  {
+stdenv.mkDerivation {
   name = "w3c-css-validator";
 
   # REGION AUTO UPDATE:       { name="w3c-css-validator"; type="cvs"; cvsRoot=":pserver:anonymous:anonymous@dev.w3.org:/sources/public"; module="2002/css-validator"; }
@@ -43,14 +40,14 @@ stdenv.mkDerivation  {
                (fetchurl { url = "http://mawercer.de/~nix/repos/w3c-css-validator-F_17-52-37.tar.gz"; sha256 = "b6f05d4812eaa464906d101242689effa8b5516d32d6420315740a77d8ee11fd"; });
   # END
 
-  buildInputs = [apacheAnt];
+  buildInputs = [ apacheAnt ];
 
   # prepare target downloads dependency .tar.gz into tmp
   # note: There is a .war as well which could be deployed to tomcat
   installPhase = ''
     cd css-validator
     mkdir tmp
-    ${ lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) }
+    ${ stdenv.lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) }
     sed -i -e 's@<property name="servlet.lib" value=".*"/>@<property name="servlet.lib" value="${tomcat}/lib/servlet-api.jar"/>@' \
           -e '/dest="tmp\//d' \
           -e '/untar/d' \
@@ -68,12 +65,12 @@ stdenv.mkDerivation  {
   '';
 
   meta = {
-      description = "w3c CSS validator";
-      homepage = http://dev.w3.org/cvsweb/2002/css-validator/;
-      # dependencies ship their own license files
-      # I think all .java files are covered by this license (?)
-      license = "w3c"; # http://www.w3.org/Consortium/Legal/ 
-      maintainers = [args.lib.maintainers.marcweber];
-      platforms = args.lib.platforms.linux;
+    description = "W3C CSS validator";
+    homepage = http://dev.w3.org/cvsweb/2002/css-validator/;
+    # dependencies ship their own license files
+    # I think all .java files are covered by this license (?)
+    license = "w3c"; # http://www.w3.org/Consortium/Legal/ 
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index 361a7b927b1..dbb46cea832 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf
+, libxml2, bzip2 }:
 
 stdenv.mkDerivation {
   name = "wv-1.2.4";
@@ -8,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
   };
 
-  buildInputs = [zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2];
+  buildInputs = [ zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2 ];
 
   meta = {
     description = "Converter from Microsoft Word formats to human-editable ones";
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
new file mode 100644
index 00000000000..2408a1cd35c
--- /dev/null
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -0,0 +1,42 @@
+{stdenv, fetchgit, libusb, autoconf, automake, confuse
+, gccCross ? null}:
+
+let
+  version = "2010-07-29";
+in
+stdenv.mkDerivation {
+  name = "xburst-tools-${version}";
+
+  src = fetchgit {
+    url = git://projects.qi-hardware.com/xburst-tools.git;
+    rev = "00be212db22643ad602eaf60b30eb943f119e78d";
+    sha256 = "66ea1a81b71bad599d76691f07a986f9bb2ccecf397e8486b661d8baace3460e";
+  };
+
+  prePatch = ''
+    find . -name Makefile* -exec sed -i \
+      -e s/mipsel-openwrt-linux-/mipsel-unknown-linux-/ {} \;
+  '';
+
+  patches = [ ./gcc-4.4.patch ];
+
+  preConfigure = ''
+    sh autogen.sh
+  '';
+
+  configureFlags = if gccCross != null then "--enable-firmware" else "";
+
+  # Not to strip cross build binaries (this is for the gcc-cross-wrapper)
+  dontCrossStrip = true;
+
+  buildInputs = [ libusb autoconf automake confuse ] ++
+    stdenv.lib.optional (gccCross != null) gccCross;
+
+  meta = {
+    description = "Qi tools to access the Ben Nanonote USB_BOOT mode";
+    license = "GPLv3";
+    homepage = http://www.linux-mtd.infradead.org/;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/tools/misc/xburst-tools/gcc-4.4.patch b/pkgs/tools/misc/xburst-tools/gcc-4.4.patch
new file mode 100644
index 00000000000..79b7be3d34f
--- /dev/null
+++ b/pkgs/tools/misc/xburst-tools/gcc-4.4.patch
@@ -0,0 +1,12 @@
+diff --git a/xbboot/host-app/host_main.c b/xbboot/host-app/host_main.c
+index 8835869..0d6fcc0 100644
+--- a/xbboot/host-app/host_main.c
++++ b/xbboot/host-app/host_main.c
+@@ -9,6 +9,7 @@
+ //
+ 
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <usb.h>
+ #include <time.h>
diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix
index e751b9aa177..ae9fed67117 100644
--- a/pkgs/tools/misc/xclip/default.nix
+++ b/pkgs/tools/misc/xclip/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, x11, libXmu }:
+
 stdenv.mkDerivation {
   name = "xclip-0.11";
 
@@ -7,11 +8,11 @@ stdenv.mkDerivation {
     sha256 = "0ipwxkfqz66fz6jlln1v46sd2kr6bkqzq6j5hkzn6pb3grmzsacg";
   };
 
-  buildInputs = [x11 libXmu];
+  buildInputs = [ x11 libXmu ];
 
   meta = { 
-      description = "access X clipboard from this console application";
-      homepage = http://people.debian.org/~kims/xclip/;
-      license = "GPL-2";
+    description = "Tool to access the X clipboard from a console application";
+    homepage = http://people.debian.org/~kims/xclip/;
+    license = "GPL-2";
   };
 }
diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix
index d627235494b..fc29af989ce 100644
--- a/pkgs/tools/networking/bsd-finger/default.nix
+++ b/pkgs/tools/networking/bsd-finger/default.nix
@@ -1,17 +1,20 @@
-args: with args;
+{ stdenv, fetchurl }:
+
+# !!! Duplication: this package is almost exactly the same as `bsd-finger'.
+
 stdenv.mkDerivation rec {
-	name = "bsd-finger-0.17";
+  name = "bsd-finger-0.17";
 
-	src = fetchurl {
-		url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz";
-		sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
-	};
+  src = fetchurl {
+    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz";
+    sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
+  };
 
-	NIX_CFLAGS_COMPILE="-D_GNU_SOURCE";
+  NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
 
-	patches = [./ubuntu-0.17-9.patch];
+  patches = [ ./ubuntu-0.17-9.patch ];
 
-	preBuild = "cd finger";
+  preBuild = "cd finger";
 
-	preInstall = '' ensureDir $out/man/man1 $out/bin '';
+  preInstall = '' ensureDir $out/man/man1 $out/bin '';
 }
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 0cfd6adef86..7d545e8c7fb 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,14 +1,18 @@
-{stdenv, fetchurl, zlibSupport ? false, zlib ? null, sslSupport ? false, openssl ? null, linkStatic ? false}:
+{ stdenv, fetchurl
+, zlibSupport ? false, zlib ? null
+, sslSupport ? false, openssl ? null
+, linkStatic ? false
+}:
 
 assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.19.7";
+  name = "curl-7.21.0";
   
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "0w2aqlms289jzpkymg14k00iay2pq9al3rlc43b3n7j0wd5gj58s";
+    sha256 = "1fl7sh38i746b57aqjqjaykwq4rhm2p1phzrgnc2h6wm2k2b95gy";
   };
   
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 14dccbe6896..49a2de6e08f 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nettools, iputils, iproute, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dhcp-4.1.0p1";
+  name = "dhcp-4.1.1-P1";
   
   src = fetchurl {
     url = "http://ftp.isc.org/isc/dhcp/${name}.tar.gz";
-    sha256 = "0il966bcls7nfd93qfqrgvd2apkm0kv7pk35lnl1nvbm7fyrik7z";
+    sha256 = "1nk36bk7yiqaj779czvlbxjs6jfn53qw7601171nx5mird806r1g";
   };
 
   patches =
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index fec96d06ea3..f7c881b1859 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "dnsmasq-2.40";
 
@@ -10,8 +11,8 @@ stdenv.mkDerivation {
   installPhase = "ensureDir \$out/bin; make DESTDIR= BINDIR=\$out/bin MANDIR=\$out/man LOCALEDIR=\$out/share/locale install"; 
 
   meta = { 
-      description = "DNS forwarder and DHCP server";
-      homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;
-      license = "GPL";
-    };
+    description = "DNS forwarder and DHCP server";
+    homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;
+    license = "GPL";
+  };
 }
diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix
index 852e6a25e90..e6b5cd9daab 100644
--- a/pkgs/tools/networking/gftp/default.nix
+++ b/pkgs/tools/networking/gftp/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, readline, ncurses, gettext, openssl, pkgconfig }:
+
 stdenv.mkDerivation {
   name = "gftp-2.0.19";
 
@@ -10,8 +11,8 @@ stdenv.mkDerivation {
   buildInputs = [ gtk readline ncurses gettext openssl pkgconfig ];
 
   meta = { 
-      description = "GTK based FTP client";
-      homepage = http://www.gftp.org;
-      license = "GPLv2+";
+    description = "GTK+-based FTP client";
+    homepage = http://www.gftp.org;
+    license = "GPLv2+";
   };
 }
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 9ce1731eb76..86430d3865c 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -1 +1,22 @@
-import ./iodine-0.4.1.nix
+{ stdenv, fetchurl, zlib, nettools }:
+
+stdenv.mkDerivation rec {
+  name = "iodine-0.4.1";
+
+  src = fetchurl {
+    url = "http://code.kryo.se/iodine/${name}.tar.gz";
+    sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5";
+  };
+
+  buildInputs = [ zlib ];
+
+  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c'';
+
+  installFlags = "prefix=\${out}";
+
+  meta = {
+    homepage = http://code.kryo.se/iodine/;
+    description = "Tool to tunnel IPv4 data through a DNS server";
+    license = "ISC";
+  };
+}
diff --git a/pkgs/tools/networking/iodine/iodine-0.4.1.nix b/pkgs/tools/networking/iodine/iodine-0.4.1.nix
deleted file mode 100644
index e20c86debe3..00000000000
--- a/pkgs/tools/networking/iodine/iodine-0.4.1.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-stdenv.mkDerivation rec {
-  name = "iodine-0.4.1";
-
-  src = fetchurl {
-    url = "http://code.kryo.se/iodine/${name}.tar.gz";
-    sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5";
-  };
-
-  buildInputs = [zlib];
-
-  patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c'';
-
-  installFlags = "prefix=\${out}";
-
-  meta = {
-    homepage = http://code.kryo.se/iodine/;
-    description = "iodine lets you tunnel IPv4 data through a DNS server.";
-    license = "ISC";
-  };
-}
diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix
index e799e5118f9..1cb984e3d1c 100644
--- a/pkgs/tools/networking/iperf/default.nix
+++ b/pkgs/tools/networking/iperf/default.nix
@@ -1,14 +1,13 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "iperf-2.0.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz;
     sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv";
   };
 
-#buildInputs =(with args; []);
-
   meta = {
     homepage = ""; 
     description = "tool to measure IP bandwidth using UDP or TCP";
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index dd6339ae105..551d2109f28 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,20 +1,27 @@
 {stdenv, fetchurl, pkgconfig, glib}:
 
 stdenv.mkDerivation rec {
-  name = "nbd-2.9.13";
-  meta = {
-    homepage = "http://nbd.sourceforge.net";
-    description = "map arbitrary files as block devices over the network";
-    license = "GPLv2";
-  };
+  name = "nbd-2.9.15";
+
   src = fetchurl {
     url = "mirror://sourceforge/nbd/${name}.tar.bz2";
-    sha256 = "d83da56a97ae70c6c52c994a64e960eaae0664fcadf1fc30f4c9f68c00d19da1";
+    sha256 = "26e2ef18cc2f214d666eef1cfb31df1ba8ee6eaa78390afd6d18f2cce9c0c704";
   };
+
   buildInputs = [pkgconfig glib];
 
   # Link this package statically to generate an nbd-server binary that
   # has no dynamic dependencies and that can be used on (non-Nix) remote
   # machines that have a different setup than the local one.
   configureFlags = "LDFLAGS=-static";
+
+  postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"'';
+
+  meta = {
+    homepage = "http://nbd.sourceforge.net";
+    description = "map arbitrary files as block devices over the network";
+    license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.simons  ];
+    platforms = stdenv.lib.platforms.gnu;
+  };
 }
diff --git a/pkgs/tools/networking/nc6/1.0.nix b/pkgs/tools/networking/nc6/1.0.nix
deleted file mode 100644
index 5cba3ae017c..00000000000
--- a/pkgs/tools/networking/nc6/1.0.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-args : with args; with builderDefs;
-let localDefs = builderDefs.passthru.function (rec {
-    src = /* put a fetchurl here */
-    fetchurl {
-      url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;
-      sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb";
-    };
-
-    buildInputs = [];
-    configureFlags = [];
-    });
-in with localDefs;
-stdenv.mkDerivation rec {
-  name = "nc6-1.0";
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs 
-     [doConfigure doMakeInstall doForceShare doPropagate]);
-  meta = {
-    description = "A netcat implementation with IPv6 support";
-    homepage = "http://www.deepspace6.net/projects/netcat6.html";
-    inherit src;
-  };
-}
-
diff --git a/pkgs/tools/networking/nc6/default.nix b/pkgs/tools/networking/nc6/default.nix
new file mode 100644
index 00000000000..348fc2e26a6
--- /dev/null
+++ b/pkgs/tools/networking/nc6/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "nc6-1.0";
+
+  src = fetchurl {
+    url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;
+    sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb";
+  };
+
+  meta = {
+    description = "A netcat implementation with IPv6 support";
+    homepage = http://www.deepspace6.net/projects/netcat6.html;
+  };
+}
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index fe9225d73fb..70db2a9d991 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,11 +1,11 @@
 {fetchurl, buildPythonPackage}:
 
 buildPythonPackage {
-  name = "offlineimap-6.2.0";
+  name = "offlineimap-6.2.0.1";
 
   src = fetchurl {
-    url = "http://software.complete.org/software/attachments/download/413/offlineimap_6.2.0.orig.tar.gz";
-    sha256 = "057pcz2291mdpkjyrwdzxfg831337sg7bbqyxmwfy42k7np5bdi4";
+    url = "http://ftp.de.debian.org/debian/pool/main/o/offlineimap/offlineimap_6.2.0.1.tar.gz";
+    sha256 = "16s7whlw7vix54dil2ri871vyggr742agykk950lnlixcv66gyhn";
   };
 
   doCheck = false;
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index 68bf5baa333..eafa51fb4f2 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -1,7 +1,17 @@
-{ fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext
+{ monolithic ? true # build monolithic amule
+, daemon ? false # build amule daemon
+, httpServer ? false # build web interface for the daemon
+, client ? false # build amule remote gui 
+, fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
 , pkgconfig, makeWrapper }:
 
-stdenv.mkDerivation rec {
+assert httpServer -> libpng != null;
+with stdenv;
+let
+  # Enable/Disable Feature
+  edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
+in 
+mkDerivation rec {
   name = "aMule-2.2.6";
 
   src = fetchurl {
@@ -10,9 +20,18 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ];
+    [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ]
+    ++ lib.optional httpServer libpng;
 
-  configureFlags = "--with-crypto-prefix=${cryptopp}";
+  configureFlags = ''
+    --with-crypto-prefix=${cryptopp}
+    --disable-debug
+    --enable-optimize
+    ${edf monolithic "monolithic"}
+    ${edf daemon "amule-daemon"}
+    ${edf client "amule-gui"}
+    ${edf httpServer "webserver"}
+  '';
 
   postConfigure = ''
     sed -i "src/libs/ec/file_generator.pl"     \
@@ -21,9 +40,8 @@ stdenv.mkDerivation rec {
 
   # aMule will try to `dlopen' libupnp and libixml, so help it
   # find them.
-  postInstall = ''
-    wrapProgram "$out/bin/amule" \
-      --prefix LD_LIBRARY_PATH ":" "${libupnp}/lib"
+  postInstall = lib.optionalString monolithic ''
+    wrapProgram "$out/bin/amule" --prefix LD_LIBRARY_PATH ":" "${libupnp}/lib"
   '';
 
   meta = {
@@ -44,6 +62,6 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
 
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.phreedom ];
   };
 }
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index 52729f78766..b1456c0666e 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -1,13 +1,14 @@
-args: with args;
-stdenv.mkDerivation ( rec {
+{ stdenv, fetchurl, pkgconfig, openssl, libsigcxx }:
+
+stdenv.mkDerivation rec {
   pname = "libtorrent";
-  version = "0.12.5";
+  version = "0.12.6";
 
   name = "${pname}-${version}";
   
   src = fetchurl {
     url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
-    sha256 = "1hcxc9aalkswb1v6ww8yf0a8dfc449g6cghndhbj0m9rzl6gfqz9";
+    sha256 = "0abisz3jgfv4zmyzbsknzvz9hwakxxpdgfl33qk0aslnchqz60kv";
   };
 
   buildInputs = [ pkgconfig openssl libsigcxx ];
@@ -15,4 +16,4 @@ stdenv.mkDerivation ( rec {
   meta = {
     description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
   };
-})
+}
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index 019cf4c6973..eee5b5acbaa 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -1,13 +1,15 @@
-args: with args;
-stdenv.mkDerivation ( rec {
+{ stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl
+, zlib, openssl }:
+
+stdenv.mkDerivation rec {
   pname = "rtorrent";
-  version = "0.8.5";
+  version = "0.8.6";
 
   name = "${pname}-${version}";
   
   src = fetchurl {
     url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
-    sha256 = "0ra6k0avh85fx1rr6wldxy6ns5p0np4c5dc7wsjqycg9f8brkihf";
+    sha256 = "1nrj1cgjhscf40zhp70m4p6gq96rqg815dn43yyjl5i42n7cd5lc";
   };
 
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
@@ -15,4 +17,4 @@ stdenv.mkDerivation ( rec {
   meta = {
     description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
   };
-})
+}
diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix
new file mode 100644
index 00000000000..83f9b74e11a
--- /dev/null
+++ b/pkgs/tools/networking/p2p/seeks/default.nix
@@ -0,0 +1,49 @@
+{ fetchurl, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl
+, autoconf, automake, libtool }:
+
+let version = "0.2.3a"; in
+stdenv.mkDerivation {
+  name = "seeks-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/seeks/solo/seeks_solo_stable-${version}.src.tar.gz";
+    sha256 = "0hjaqwcaa19qbq28y5gq0415fz10vx034aghqa01hrhhl9yrjvc4";
+  };
+
+  buildInputs =
+    [ zlib docbook2x pcre curl libxml2 libevent perl
+      autoconf automake libtool
+    ];
+
+  # The tarball doesn't contain `configure' & co.  Sigh...
+  preConfigure = "autoreconf -vfi";
+
+  configureFlags =
+    [ # Enable the built-in web server providing a web search interface.
+      # See <http://www.seeks-project.info/wiki/index.php/Seeks_On_Web>.
+      "--enable-httpserv-plugin=yes"
+      "--with-libevent=${libevent}"
+    ];
+
+  meta = {
+    description = "Seeks, a social web search engine";
+
+    longDescription =
+      '' Seeks is a free and open technical design and application for
+         enabling social websearch.  Its specific purpose is to regroup users
+         whose queries are similar so they can share both the query results
+         and their experience on these results.  On this basis, Seeks allows
+         for true real-time, decentralized, websearch to emerge.
+
+         In the long term, there is no need for web crawlers and third-party
+         web indexes as users can push content directly to search groups.
+      '';
+
+    license = "AGPLv3+";
+
+    homepage = http://www.seeks-project.info/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 5a3374fbef0..d111d459aba 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -1,14 +1,19 @@
 { fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow
 , simplejson, zfec, pycryptopp, pysqlite, darcsver, setuptoolsTrial
-, setuptoolsDarcs, numpy, nettools }:
+, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock }:
+
+# FAILURES: The "running build_ext" phase fails to compile Twisted
+# plugins, because it tries to write them into Twisted's (immutable)
+# store path. The problem appears to be non-fatal, but there's probably
+# some loss of functionality because of it.
 
 buildPythonPackage (rec {
-  name = "tahoe-lafs-1.6.1";
+  name = "tahoe-lafs-1.7.1";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.6.1.zip";
-    sha256 = "1b0m1fj1lrd9kvlavd6303jjgvzasj6rnlwhdysn4i2zqriv8d9f";
+    url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.7.1.zip";
+    sha256 = "7e676e1ea517b3f6f6f76d56f712e72a5c2d4287fdd474abc9523aa533fd9038";
   };
 
   patches = [ ./test-timeout.patch ];
@@ -39,12 +44,12 @@ buildPythonPackage (rec {
   '';
 
   buildInputs = [ unzip ]
-    ++ [ numpy ]; # Some tests want this
+    ++ [ numpy ]; # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2
 
   # The `backup' command requires `pysqlite'.
   propagatedBuildInputs =
     [ twisted foolscap nevow simplejson zfec pycryptopp pysqlite
-      darcsver setuptoolsTrial
+      darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 mock
     ];
 
   # The test suite is run in `postInstall'.
@@ -82,7 +87,7 @@ buildPythonPackage (rec {
 
     license = [ "GPLv2+" /* or */ "TGPPLv1+" ];
 
-    maintainers = [ lib.maintainers.ludo ];
+    maintainers = [ lib.maintainers.ludo lib.maintainers.simons  ];
     platforms = lib.platforms.gnu;  # arbitrary choice
   };
 })
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix
index 8023175c52a..65a1d241c0b 100644
--- a/pkgs/tools/networking/stun/default.nix
+++ b/pkgs/tools/networking/stun/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
 stdenv.mkDerivation {
   name = "stun-0.96.dfsg-5";
 
@@ -26,11 +27,10 @@ stdenv.mkDerivation {
   };
 
   meta = {
-    description = "stun server and test client";
-    longDescription = "eg useful to debug voip trouble";
+    description = "Stun server and test client";
     homepage = http://sourceforge.net/projects/stun/;
     license = "Vovida 1.0"; # See any header file.
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/tcng/default.nix b/pkgs/tools/networking/tcng/default.nix
index e0f66df830d..dd2082d30b2 100644
--- a/pkgs/tools/networking/tcng/default.nix
+++ b/pkgs/tools/networking/tcng/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, bison, flex, db4, perl, kernel, iproute }:
 
 # tcc can even compile kernel modules for speed reason.
 # that would be a nice use case to test!
@@ -10,7 +10,7 @@ args: with args;
 
 let version = "10b"; in
 
-args.stdenv.mkDerivation {
+stdenv.mkDerivation {
 
   name = "tcng-${version}";
 
@@ -19,13 +19,14 @@ args.stdenv.mkDerivation {
     sha256 = "1xjs0yn90rfa8ibxybg3gab1xzcjg60njymq2bd1b0a9i0arx7ji";
   };
 
-  iproute2Src=iproute.src;
+  iproute2Src = iproute.src;
 
-  patches = [
-    (fetchurl {
-      url = mirror://debian/pool/main/t/tcng/tcng_10b-2.diff.gz;
-      sha256 = "17i4s2ffif0k4b78gfhkp08lvvharbfvyhwbd0vkwgpria0b9zrd";
-    })];
+  patches =
+    [ (fetchurl {
+        url = mirror://debian/pool/main/t/tcng/tcng_10b-2.diff.gz;
+        sha256 = "17i4s2ffif0k4b78gfhkp08lvvharbfvyhwbd0vkwgpria0b9zrd";
+      })
+    ];
   
   # one mailinglist post says you should just add your kernel version to the list.. (?)
   patchPhase = ''
@@ -38,7 +39,6 @@ args.stdenv.mkDerivation {
     find . -type f | xargs sed -i 's@/lib/cpp@cpp@g'
   '';
 
-
   # gentoo ebulid says tcsim doesn't compile with 2.6 headers..
   # DATADIR can still be overridden by env TOPDIR=...
   # Don't know whats it for except including the default .tc files
@@ -55,12 +55,11 @@ args.stdenv.mkDerivation {
     --with-tcsim
   '';
 
-
   # hacky, how to enable building tcc the correct way?
   # adding shared and tcc to SUBDIRS and run make again isn't nice but works
   buildPhase = ''
     sed -i 's@^\(SUBDIRS.*\)@\1 shared tcc@' Makefile 
-    make;
+    make
   '';
 
   # manually copy tcc and include files.. see comment above
@@ -71,16 +70,11 @@ args.stdenv.mkDerivation {
     cp tcc/*.tc $out/lib/tcng/include
   '';
 
-  buildInputs =(with args; [bison flex db4 perl]);
+  buildInputs = [ bison flex db4 perl ];
 
   meta = { 
-      description="tcng - Traffic Control Next Generation";
-      homepage = "http://tcng.sourceforge.net/";
-      license = "GPLv2";
-      longDescription = ''
-        useful links: http://linux-ip.net/articles/Traffic-Control-HOWTO,
-        http://blog.edseek.com/~jasonb/articles/traffic_shaping/
-        tcng language: http://linux-ip.net/gl/tcng/node9.html tcng language
-      '';
+    description = "tcng - Traffic Control Next Generation";
+    homepage = "http://tcng.sourceforge.net/";
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix
new file mode 100644
index 00000000000..e739f806e6c
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/0.8.2.nix
@@ -0,0 +1,13 @@
+{cabal, HTTP, network, zlib} :
+
+cabal.mkDerivation (self : {
+  pname = "cabal-install";
+  name = self.fname;
+  version = "0.8.2"; # Haskell Platform 2010.2.0.0
+  sha256 = "8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b";
+  extraBuildInputs = [HTTP network zlib];
+
+  meta = {
+    description = "The command-line interface for Cabal and Hackage";
+  };
+})
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index e10abe9ac81..2ffacb08479 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, perl, zlib, bzip2}:
 
+let version = "1.14.29"; in
+
 stdenv.mkDerivation {
-  name = "dpkg-1.14.28";
-  
+  name = "dpkg-${version}";
+
   src = fetchurl {
-    url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.28.tar.gz;
-    sha256 = "1k3h1rv2qd6ha6mpifhjkpasd4dzr8l45jvc49p7fldqm4nzyixc";
+    url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.gz";
+    sha256 = "0cynms4vziy957r4zskybbid87sz99vrfy8d999vlhxgc74c2zpa";
   };
 
   configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg";
@@ -26,7 +28,7 @@ stdenv.mkDerivation {
     substituteInPlace dpkg-split/Makefile.in --replace "install-data-local:" "disabled:"
   '';
 
-  buildInputs = [perl zlib bzip2];
+  buildInputs = [ perl zlib bzip2 ];
 
   meta = {
     description = "The Debian package manager";
diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix
index d62352d0790..8fe65ad3936 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.16pre22073";
+  name = "nix-0.16pre22378";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/429995/download/4/${name}.tar.bz2";
-    sha256 = "90caa59a2b09acc0fdd3951e2751105adf4051ca307a3060c4063aa8b75df752";
+    url = "http://hydra.nixos.org/build/467032/download/4/${name}.tar.bz2";
+    sha256 = "1bd3645da0bc03b70e4b0d687c6c0868bb1522b01b6acf4af858556f8f21ee57";
   };
 
   buildInputs = [ perl curl openssl ];
diff --git a/pkgs/tools/pydb/default.nix b/pkgs/tools/pydb/default.nix
index 07d9545529b..7aa2d57955f 100644
--- a/pkgs/tools/pydb/default.nix
+++ b/pkgs/tools/pydb/default.nix
@@ -1,22 +1,23 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, python, emacs }:
+
+stdenv.mkDerivation {
   name = "pydb-1.26";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url =  "mirror://sourceforge.net/sourceforge/bashdb/pydb-1.26.tar.bz2";
     sha256 = "1wlkz1hd5d4gkzhkjkzcm650c1lchj28hj36jx96mklglm41h4q1";
   };
 
-  buildInputs =(with args; [python emacs /* emacs is optional */]);
+  buildInputs = [ python emacs /* emacs is optional */ ];
 
   preConfigure = ''
     p="$(toPythonPath $out)"
-    configureFlags="$configureFlags --with-python=${args.python}/bin/python --with-site-packages=$p"
+    configureFlags="$configureFlags --with-python=${python}/bin/python --with-site-packages=$p"
   '';
 
   meta = { 
-      description = "python debugger with gdb like commands and emacs bindings";
-      homepage = http://bashdb.sourceforge.net/pydb/;
-      license = "GPLv3";
+    description = "Python debugger with GDB-like commands and Emacs bindings";
+    homepage = http://bashdb.sourceforge.net/pydb/;
+    license = "GPLv3";
   };
 }
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 4a5627072ca..46966835e14 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -3,7 +3,7 @@
 , pycairo, pysqlite
 }:
   
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "nmap-5.21";
 
   src = fetchurl {
@@ -11,11 +11,20 @@ stdenv.mkDerivation (rec {
     sha256 = "1fmh05iamynmr8zic3bja6dr0pfiwp0hr2nc2wpiqm2pc7w29jwz";
   };
 
-  postInstall =''
-    wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0
-  '';
+  patches =
+    [ (fetchurl {
+        url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-analyzer/nmap/files/nmap-5.21-openssl-1.patch?revision=1.1";
+        sha256 = "0q0kgwvg5b770xpp31a5a3lxh8d5ik6d5bv11nlh3syd78q6f08y";
+      })
+    ];
 
-  buildInputs = [
-    libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite
-  ];
-})
+  patchFlags = "-p0";
+
+  postInstall =
+    ''
+      wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0
+    '';
+
+  buildInputs =
+    [ libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite ];
+}
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
new file mode 100644
index 00000000000..5939037abfe
--- /dev/null
+++ b/pkgs/tools/security/pius/default.nix
@@ -0,0 +1,46 @@
+{ fetchurl, stdenv, python, gnupg }:
+
+let version = "2.0.7"; in
+stdenv.mkDerivation {
+  name = "pius-${version}";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pgpius/pius/${version}/pius-${version}.tar.bz2";
+    sha256 = "1iyd3z96vp2g7r6s1v34x3vpxikkcy60f15d84r0qla373zl4xd8";
+  };
+
+  buildInputs = [ python ];
+
+  patchPhase =
+    '' sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g'
+    '';
+
+  buildPhase = "true";
+
+  installPhase =
+    '' ensureDir "$out/bin"
+       cp -v pius "$out/bin"
+
+       ensureDir "$out/doc/pius-${version}"
+       cp -v README "$out/doc/pius-${version}"
+    '';
+
+  meta = {
+    homepage = http://www.phildev.net/pius/;
+
+    description = "PGP Individual UID Signer (PIUS), quickly and easily sign UIDs on a set of PGP keys";
+
+    longDescription =
+      '' This software will allow you to quickly and easily sign each UID on
+         a set of PGP keys.  It is designed to take the pain out of the
+         sign-all-the-keys part of PGP Keysigning Party while adding security
+         to the process.
+      '';
+
+    license = "GPLv2";
+
+    platforms = stdenv.lib.platforms.gnu;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
+}
diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix
deleted file mode 100644
index 15288361baf..00000000000
--- a/pkgs/tools/security/ssss/0.5.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-args : with args; with builderDefs;
-	let localDefs = builderDefs.passthru.function (rec {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;
-			sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx";
-		};
-
-		buildInputs = [gmp];
-		configureFlags = [];
-		doPatch = fullDepEntry (''
-			sed -e s@/usr/@$out/@g -i Makefile
-			cp ssss.manpage.xml ssss.1
-			cp ssss.manpage.xml ssss.1.html
-			ensureDir $out/bin $out/share/man/man1
-			echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
-		'') ["minInit" "doUnpack" "defEnsureDir"];
-	});
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "ssss-0.5";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs 
-			["doPatch" doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Shamir Secret Sharing Scheme";
-		inherit src;
-	};
-}
diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix
new file mode 100644
index 00000000000..3816df415c6
--- /dev/null
+++ b/pkgs/tools/security/ssss/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "ssss-0.5";
+
+  src = fetchurl {
+    url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;
+    sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx";
+  };
+
+  buildInputs = [ gmp ];
+
+  preBuild =
+    ''
+      sed -e s@/usr/@$out/@g -i Makefile
+      cp ssss.manpage.xml ssss.1
+      cp ssss.manpage.xml ssss.1.html
+      ensureDir $out/bin $out/share/man/man1
+      echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
+    '';
+
+  meta = {
+    description = "Shamir Secret Sharing Scheme";
+    homepage = http://point-at-infinity.org/ssss/;
+  };
+}
diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index 6ad363d2d55..233a0c39d17 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -2,51 +2,55 @@
 # restart using 'killall -TERM fcron; fcron -b
 # use convert-fcrontab to update fcrontab files
 
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation {
   name = "fcron-3.0.4";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://fcron.free.fr/archives/fcron-3.0.4.src.tar.gz;
     sha256 = "15kgphsfa0nqgjd8yxyz947x2xyljj4iyh298kw4c8bz6iznqxn8";
   };
 
-  buildInputs =(with args; [perl]);
-
-  configureFlags = [ "--with-sendmail=/var/setuid-wrappers/sendmail"
-                    "--with-editor=/var/run/current-system/sw/bin/vi"
-                    "--with-bootinstall=no"
-                    "--sysconfdir=/etc"
-                    # fcron would have been default user/grp
-                    "--with-username=root"
-                    "--with-groupname=root"
-                    # fcron must not try to verify that sendmail has already been installed int /var/setuid-wrappers/sendmail
-                    "--disable-checks"
-                  ];
+  buildInputs = [ perl ];
+
+  configureFlags =
+    [ "--with-sendmail=/var/setuid-wrappers/sendmail"
+      "--with-editor=/var/run/current-system/sw/bin/vi"
+      "--with-bootinstall=no"
+      "--sysconfdir=/etc"
+      # fcron would have been default user/grp
+      "--with-username=root"
+      "--with-groupname=root"
+      # fcron must not try to verify that sendmail has already been installed int /var/setuid-wrappers/sendmail
+      "--disable-checks"
+    ];
+    
   installTargets = "install-staged"; # install does also try to change permissions of /etc/* files
-  preConfigure = ''
-    sed -i 's@/usr/bin/env perl@${args.perl}/bin/perl@g' configure script/*
-    # Don't let fcron create the group fcron, nix(os) should do this
-    sed -i '2s@.*@exit 0@' script/user-group
-
-    # --with-bootinstall=no shoud do this, didn't work. So just exit the script before doing anything
-    sed -i '2s@.*@exit 0@' script/boot-install
-
-    # also don't use chown or chgrp for documentation (or whatever) when installing
-    find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@'
-
-  '';
-
-  patchPhase = ''
-    # don't try to create /etc/fcron.{allow,deny,conf} 
-
-    sed -i -e 's@test -f $(DESTDIR)$(ETC)/fcron.conf @ # @' \
-           -e 's@if test ! -f $(DESTDIR)$(ETC)/fcron.allow@ # @' Makefile.in
-  '';
+  
+  preConfigure =
+    ''
+      sed -i 's@/usr/bin/env perl@${perl}/bin/perl@g' configure script/*
+      # Don't let fcron create the group fcron, nix(os) should do this
+      sed -i '2s@.*@exit 0@' script/user-group
+
+      # --with-bootinstall=no shoud do this, didn't work. So just exit the script before doing anything
+      sed -i '2s@.*@exit 0@' script/boot-install
+
+      # also don't use chown or chgrp for documentation (or whatever) when installing
+      find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@'
+    '';
+
+  patchPhase =
+    ''
+      # don't try to create /etc/fcron.{allow,deny,conf} 
+      sed -i -e 's@test -f $(DESTDIR)$(ETC)/fcron.conf @ # @' \
+             -e 's@if test ! -f $(DESTDIR)$(ETC)/fcron.allow@ # @' Makefile.in
+    '';
 
   meta = { 
-      description="A command scheduler with extended capabilities over cron and anacron";
-      homepage =  http://fcron.free.fr;
-      license = "GPLv2";
+    description="A command scheduler with extended capabilities over cron and anacron";
+    homepage = http://fcron.free.fr;
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/system/gdmap/0.7.5.nix b/pkgs/tools/system/gdmap/0.7.5.nix
deleted file mode 100644
index ef07df5bf8d..00000000000
--- a/pkgs/tools/system/gdmap/0.7.5.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args : with args;
-	let localDefs = builderDefs {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://dfn.dl.sourceforge.net/sourceforge/gdmap/gdmap-0.7.5.tar.gz;
-			sha256 = "0vxfgz1bq0jvny6dy7dkzg2kl56plrxby6c4y5d6bv4bq2xd6v26";
-		};
-
-		buildInputs = [gtk pkgconfig libxml2 intltool];
-		configureFlags = [];
-	} null; /* null is a terminator for sumArgs */
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "gdmap"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Recursive rectangle map of disk usage";
-		inherit src;
-	};
-}
diff --git a/pkgs/tools/system/gdmap/0.8.1.nix b/pkgs/tools/system/gdmap/0.8.1.nix
deleted file mode 100644
index 73d3ff92323..00000000000
--- a/pkgs/tools/system/gdmap/0.8.1.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		fetchurl {
-		    url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
-		    sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
-		};
-
-		buildInputs = [gtk pkgconfig libxml2 intltool gettext];
-		configureFlags = [];
-	};
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = "gdmap-0.8.1";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "Recursive rectangle map of disk usage";
-		inherit src;
-	};
-}
diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix
new file mode 100644
index 00000000000..f361e862b63
--- /dev/null
+++ b/pkgs/tools/system/gdmap/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }:
+
+stdenv.mkDerivation {
+  name = "gdmap-0.8.1";
+  
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;
+    sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
+  };
+
+  buildInputs = [ gtk pkgconfig libxml2 intltool gettext ];
+
+  meta = {
+    description = "Recursive rectangle map of disk usage";
+  };
+}
diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix
index 3c14d207a56..2b4f28fa868 100644
--- a/pkgs/tools/system/mcron/default.nix
+++ b/pkgs/tools/system/mcron/default.nix
@@ -1,17 +1,19 @@
 { fetchurl, stdenv, guile, which, ed }:
 
 stdenv.mkDerivation rec {
-  name = "mcron-1.0.4";
+  name = "mcron-1.0.6";
 
   src = fetchurl {
     url = "mirror://gnu/mcron/${name}.tar.gz";
-    sha256 = "0wrpi9qj50a8wfslapnkmsr6d3qx40hfw57a022m1z1syiljq4xl";
+    sha256 = "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy";
   };
 
   patches = [ ./install-vixie-programs.patch ];
 
   buildInputs = [ guile which ed ];
 
+  doCheck = true;
+
   meta = {
     description = "GNU mcron, a flexible implementation of `cron' in Guile";
 
diff --git a/pkgs/tools/system/mcron/install-vixie-programs.patch b/pkgs/tools/system/mcron/install-vixie-programs.patch
index 98cdb6d142c..d268ecb4a0a 100644
--- a/pkgs/tools/system/mcron/install-vixie-programs.patch
+++ b/pkgs/tools/system/mcron/install-vixie-programs.patch
@@ -1,22 +1,23 @@
 This patch allows us to install the Vixie-compatible binaries as
-non-root.
+non-root without creating /var/run, etc.
 
---- mcron-1.0.4/makefile.in	2008-02-21 20:55:24.000000000 +0100
-+++ mcron-1.0.4/makefile.in	2009-04-03 20:18:44.000000000 +0200
-@@ -872,15 +872,11 @@ mcron.c : main.scm crontab.scm makefile.
+--- mcron-1.0.6/makefile.in	2010-06-19 20:44:17.000000000 +0200
++++ mcron-1.0.6/makefile.in	2010-07-04 16:16:25.000000000 +0200
+@@ -1004,15 +1004,11 @@ mcron.c : main.scm crontab.scm makefile.
  	@rm -f mcron.escaped.scm > /dev/null 2>&1
  
  install-exec-hook:
--	@if [ "`id -u`" -eq "0" ]; then \
-+	@if true; then \
- 	   rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
- 	   $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
- 	   rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
- 	   $(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
--	   ./mkinstalldirs -m 'u=rwx' /var/cron; \
--	   ./mkinstalldirs -m 'u=rwx,og=rx' /var/run; \
--	   ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@; \
--	   ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@/mcron; \
+-	@if [ "x@NO_VIXIE_CLOBBER@" != "xyes"   -a   "`id -u`" -eq "0" ]; then \
++	@if [ "x@NO_VIXIE_CLOBBER@" != "xyes" ]; then \
+        rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
+        $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
+        rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
+        $(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
+-       $(INSTALL) -d --mode='u=rwx' $(DESTDIR)/var/cron; \
+-       $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)/var/run; \
+-       $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \
+-       $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \
+     elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \
+        echo "Not installing Vixie-style programs"; \
      else \
-        echo "+++ WARNING: NON-ROOT INSTALL: ONLY mcron WILL BE INSTALLED, NOT ANY OF THE VIXIE REPLACEMENT PROGRAMS"; \
- 	fi
+
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 0c933967113..563521429a8 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, zlib}:
+{ stdenv, fetchurl, zlib }:
 
-stdenv.mkDerivation {
-  name = "pciutils-3.1.2";
+stdenv.mkDerivation rec {
+  name = "pciutils-3.1.7";
   
   src = fetchurl {
-    url = mirror://kernel/software/utils/pciutils/pciutils-3.1.2.tar.bz2;
-    sha256 = "15wksvqcgdj0hvsp5irc1igiqid69rrzpc33qj9nlyssvyw40vpn";
+    url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
+    sha256 = "0i7mqf1fkmdqsawdk2badv6k3xrkryq0i2xknclvy6kcjsv27znq";
   };
   
-  buildInputs = [zlib];
+  buildInputs = [ zlib ];
 
   pciids = fetchurl {
     # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://nixos.org/tarballs/pci.ids.20090727.bz2;
-    sha256 = "0q7fs5ww92a6v5dc514ff4vy7v9hzpdqbd1agbafc2wk2zgi10mk";
+    url = http://nixos.org/tarballs/pci.ids.20100714.bz2;
+    sha256 = "0vll4svr60l6217yna7bfhcjm3prxr2b62ynq4jaagdp1rilfbap";
   };
 
   # Override broken auto-detect logic.
diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix
index 2111a2b8dc1..6dab8f86c32 100644
--- a/pkgs/tools/text/multitran/libfacet/default.nix
+++ b/pkgs/tools/text/multitran/libfacet/default.nix
@@ -1,7 +1,8 @@
-{stdenv, fetchurl, libmtsupport} :
+{ stdenv, fetchurl, libmtsupport }:
 
 stdenv.mkDerivation {
   name = "libfacet-0.0.1alpha2";
+  
   src = fetchurl {
     url = mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2;
     sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144";
@@ -15,7 +16,6 @@ stdenv.mkDerivation {
       src/Makefile;
   '';
 
-
   meta = {
     homepage = http://multitran.sourceforge.net/;
     description = "Multitran lib: enchanced locale facets";
diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index b89ffb850a0..0ab73142ea0 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -1,21 +1,19 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "patchutils-0.3.0";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.0.tar.bz2;
     sha256 = "08jzvprhpcgwvx0xlkwc8dbdd9ilvwyr3cwnq96xmbfipch69yi7";
   };
 
-  buildInputs =(with args; []);
-
   meta = { 
-      description = "collection of programs that operate on patch files, fix"
-        + " diffs after manually editing them, create a diff of diffs etc";
-      homepage = http://cyberelk.net/tim/software/patchutils;
-      license = "GPLv2";
-      executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
-        "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
-        "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
+    description = "Tools to manipulate patch files";
+    homepage = http://cyberelk.net/tim/software/patchutils;
+    license = "GPLv2";
+    executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
+      "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
+      "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
   };
 }
diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix
index 7ae7241c40b..760ab077012 100644
--- a/pkgs/tools/text/wdiff/default.nix
+++ b/pkgs/tools/text/wdiff/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wdiff-0.6.1";
+  name = "wdiff-0.6.3";
 
   src = fetchurl {
     url = "mirror://gnu/wdiff/${name}.tar.gz";
-    sha256 = "0cgmx9k8sj0l79kp4m2lmn4ifx55ah68q4qk7xsanx69m1061ghf";
+    sha256 = "04x0snfyahw9si160zwghh5nmijn535iacbbfsd376w4p0k5zk08";
   };
 
   doCheck = true;
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index ce74a0812d3..012c98f6887 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,13 +1,13 @@
-{cabal, tetex, polytable, regexCompat, utf8String}:
+{cabal, tetex, polytable, regexCompat}:
 
 #assert tetex == polytable.tetex;
 
 cabal.mkDerivation (self : {
   pname = "lhs2tex";
-  version = "1.15";
+  version = "1.16";
   name = self.fname;
-  sha256 = "77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124";
-  extraBuildInputs = [tetex regexCompat utf8String];
+  sha256 = "aa43ec92e8d7c94213365a7211d605314476977155e36420caa3cfb394f7c76f";
+  extraBuildInputs = [tetex regexCompat];
   propagatedBuildInputs = [polytable]; # automatically in user-env now with cabal
 
   postInstall = ''
diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix
index 4249d32b3ce..806a0b21096 100644
--- a/pkgs/tools/video/swftools/default.nix
+++ b/pkgs/tools/video/swftools/default.nix
@@ -1,24 +1,18 @@
-args:
-args.stdenv.mkDerivation {
-  # snapshot version does'nt compile
-  #name = "swftools-2008-10-13-1554";
-  name = "swftools-0.8.1";
+{ stdenv, fetchurl, zlib }:
 
-  src = args.fetchurl {
-    #url = http://www.swftools.org/swftools-2008-10-13-1554.tar.gz;
-    #sha256 = "05r2qg8yc6lpj5263jyrdykr2vkq9rlyqxydx0rnfnkqpr7s6931";
+stdenv.mkDerivation {
+  name = "swftools-0.8.1";
 
+  src = fetchurl {
     url = http://www.swftools.org/swftools-0.8.1.tar.gz;
     sha256 = "0l75c3ibwd24g9nqghp1rv1dfrlicw87s0rbdnyffjv4izz6gc2l";
   };
 
-  buildInputs =(with args; [zlib 
-                            # the following are not needed to compile 0.8.1
-                            libjpeg giflib freetype]);
+  buildInputs = [ zlib ];
 
   meta = { 
-      description = "collection of SWF manipulation and creation utilities";
-      homepage = http://www.swftools.org/about.html;
-      license = "GPLv2";
-    };
+    description = "Collection of SWF manipulation and creation utilities";
+    homepage = http://www.swftools.org/about.html;
+    license = "GPLv2";
+  };
 }
diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
index e5114ddaed6..622b26f0b35 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "ec2-ami-tools";
+  name = "ec2-ami-tools-1.3-53773";
   
-  buildInputs = [unzip makeWrapper];
+  buildInputs = [ unzip makeWrapper ];
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
-    sha256 = "2a7c848abea286234adcbb08938cfad50b844ecdfc7770e781289d9d396a1972";
+    sha256 = "0wsgd656wiwn0maqanz6c61jdwaz0gva8wx25x312xnsl8k0gy94";
   };
 
   # Amazon EC2 requires that disk images are writable.  If they're
diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
index 6c568a95c2f..e242b1e69d1 100644
--- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation {
-  name = "ec2-api-tools-1.3-46266";
+  name = "ec2-api-tools-1.3-53907";
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
-    sha256 = "06d5hpzc18bj30hjc477xx62hsspgfkn3fdccrg1avadgwsykgq6";
+    sha256 = "1jdkc74a9fmjqwvq1pnbsnfqyxxjg5zgaynybmdms5piinvb204d";
   };
 
   buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a4e0c20bd9..c531a99bf14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2,10 +2,7 @@
    imports the functions that build the various packages, and calls
    them with appropriate arguments.  The result is a set of all the
    packages in the Nix Packages collection for some particular
-   platform.
-
-   You want to get to know where to add a new package ?
-   Have a look at nixpkgs/maintainers/docs/classification.txt */
+   platform. */
 
 
 { # The system (e.g., `i686-linux') for which to build the packages.
@@ -99,12 +96,22 @@ let
   __overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig;
 
   pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to packageOverrides
-  pkgsOverriden = pkgsFun __overrides; # the overriden, final packages
-  pkgs = pkgsOverriden // helperFunctions;
+  pkgs = pkgsFun __overrides; # the overriden, final packages
+
+
+  # We use `callPackage' to be able to omit function arguments that
+  # can be obtained from `pkgs' or `pkgs.xorg' (i.e. `defaultScope').
+  # Use `newScope' for sets of packages in `pkgs' (see e.g. `gtkLibs'
+  # below).
+  callPackage = newScope {};
+
+  newScope = extra: lib.callPackageWith (defaultScope // extra);
+  
+  defaultScope = pkgs // pkgs.xorg;
 
 
   # The package compositions.  Yes, this isn't properly indented.
-  pkgsFun = __overrides: with helperFunctions; rec {
+  pkgsFun = __overrides: with helperFunctions; helperFunctions // rec {
 
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: (import ./all-packages.nix) {
@@ -139,7 +146,7 @@ let
 
   inherit lib config getConfig stdenvAdapters;
 
-  inherit (lib) lowPrio appendToName makeOverridable;
+  inherit (lib) lowPrio hiPrio appendToName makeOverridable;
 
   # Applying this to an attribute set will cause nix-env to look
   # inside the set for derivations.
@@ -152,22 +159,11 @@ let
   # Return the first available value in the order: pkg.val, val, or default.
   getPkgConfig = pkg : val : default : (getConfig [ pkg val ] (getConfig [ val ] default));
 
-  # Check absence of non-used options
-  checker = x: flag: opts: config:
-    (if flag then let result=(
-      (import ../build-support/checker)
-      opts config); in
-      (if (result=="") then x else
-      abort ("Unknown option specified: " + result))
-    else x);
-
-  builderDefs = composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
+  builderDefs = lib.composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
     inherit stringsWithDeps lib stdenv writeScript
       fetchurl fetchmtn fetchgit;
   };
 
-  composedArgsAndFun = lib.composedArgsAndFun;
-
   builderDefsPackage = builderDefs.builderDefsPackage builderDefs;
 
   stringsWithDeps = lib.stringsWithDeps;
@@ -211,6 +207,7 @@ let
     else
       stdenv;
 
+
   ### BUILD SUPPORT
 
   attrSetToDir = arg : import ../build-support/upstream-updater/attrset-to-dir.nix {
@@ -223,11 +220,14 @@ let
     inherit stdenv perl;
   };
 
-  debPackage = {
-    debBuild = lib.sumTwoArgs(import ../build-support/deb-package) {
-      inherit builderDefs;
-    };
-    inherit fetchurl stdenv;
+  dotnetenv = import ../build-support/dotnetenv {
+    inherit stdenv;
+    dotnetfx = dotnetfx35;
+  };
+
+  vsenv = import ../build-support/vsenv {
+    inherit stdenv;
+    vs = vs90wrapper;
   };
 
   fetchbzr = import ../build-support/fetchbzr {
@@ -363,9 +363,9 @@ let
     inherit stdenv fetchurl unzip makeWrapper ruby openssl;
   };
 
-  amule = import ../tools/networking/p2p/amule {
+  amule = makeOverridable (import ../tools/networking/p2p/amule) {
     inherit fetchurl stdenv zlib perl cryptopp gettext libupnp makeWrapper
-      wxGTK pkgconfig;
+      wxGTK pkgconfig libpng;
   };
 
   aria = builderDefsPackage (import ../tools/networking/aria) {
@@ -467,6 +467,14 @@ let
     inherit fetchurl stdenv python wxPython26;
   };
 
+  blueman = import ../tools/bluetooth/blueman {
+    inherit fetchurl stdenv pkgconfig intltool python pyrex
+      pygobject pygtk pythonDBus bluez libstartup_notification
+      makeWrapper xdg_utils;
+    inherit (pythonPackages) notify;
+    inherit (gtkLibs) glib gtk;
+  };
+
   bmrsa = builderDefsPackage (import ../tools/security/bmrsa/11.nix) {
     inherit unzip;
   };
@@ -545,6 +553,10 @@ let
     inherit fetchurl stdenv ppl;
   };
 
+  convmv = import ../tools/misc/convmv {
+    inherit stdenv fetchurl perl;
+  };
+
   coreutils_real = makeOverridable (if stdenv ? isDietLibC
       then import ../tools/misc/coreutils-5
       else import ../tools/misc/coreutils)
@@ -584,7 +596,7 @@ let
   };
 
   dar = import ../tools/archivers/dar {
-    inherit fetchurl stdenv zlib bzip2 openssl;
+    inherit fetchurl stdenv zlib bzip2 openssl attr;
   };
 
   davfs2 = import ../tools/filesystems/davfs2 {
@@ -597,7 +609,7 @@ let
   };
 
   debootstrap = import ../tools/misc/debootstrap {
-    inherit fetchurl stdenv lib dpkg gettext gawk wget perl;
+    inherit fetchurl stdenv dpkg gettext gawk wget perl;
   };
 
   ddclient = import ../tools/networking/ddclient {
@@ -649,10 +661,14 @@ let
     libiconv = if stdenv.isDarwin then libiconv else null;
   };
 
-  dosfstools = composedArgsAndFun (import ../tools/filesystems/dosfstools) {
+  dosfstools = makeOverridable (import ../tools/filesystems/dosfstools) {
     inherit builderDefs;
   };
 
+  dotnetfx35 = import ../development/libraries/dotnetfx35 {
+    inherit stdenv;
+  };
+
   dropbear = makeOverridable (import ../tools/networking/dropbear) {
     inherit fetchurl stdenv;
     enableStatic = true;
@@ -685,7 +701,7 @@ let
     inherit fetchurl stdenv gettext;
   };
 
-  eprover = composedArgsAndFun (import ../tools/misc/eProver) {
+  eprover = makeOverridable (import ../tools/misc/eProver) {
     inherit fetchurl stdenv which;
     texLive = texLiveAggregationFun {
       paths = [
@@ -738,10 +754,6 @@ let
     inherit fetchurl stdenv coreutils;
   };
 
-  findutilsWrapper = lowPrio (appendToName "wrapper" (import ../tools/misc/findutils-wrapper {
-    inherit stdenv findutils;
-  }));
-
   finger_bsd = import ../tools/networking/bsd-finger {
     inherit fetchurl stdenv;
   };
@@ -755,6 +767,7 @@ let
     inherit fetchurl stdenv gettext freetype zlib
       libungif libpng libjpeg libtiff libxml2 lib;
     inherit (xlibs) libX11 xproto libXt;
+    withX11 = true;
   };
 
   dos2unix = import ../tools/text/dos2unix {
@@ -770,10 +783,10 @@ let
       inherit fetchurl stdenv;
     });
 
-  gdmap = composedArgsAndFun (import ../tools/system/gdmap/0.8.1.nix) {
-    inherit stdenv fetchurl builderDefs pkgconfig libxml2 intltool
+  gdmap = makeOverridable (import ../tools/system/gdmap) {
+    inherit stdenv fetchurl pkgconfig libxml2 intltool
       gettext;
-    inherit (gtkLibs) gtk;
+    inherit (gtkLibs216) gtk;
   };
 
   genext2fs = import ../tools/filesystems/genext2fs {
@@ -789,12 +802,12 @@ let
   };
 
   gftp = import ../tools/networking/gftp {
-    inherit lib fetchurl stdenv;
+    inherit fetchurl stdenv;
     inherit readline ncurses gettext openssl pkgconfig;
-    inherit (gtkLibs) glib gtk;
+    inherit (gtkLibs) gtk;
   };
 
-  gifsicle = import ../tools/graphics/gifscile {
+  gifsicle = import ../tools/graphics/gifsicle {
     inherit fetchurl stdenv;
     inherit (xlibs) xproto libXt libX11;
   };
@@ -845,6 +858,8 @@ let
     inherit (xlibs) libX11 libXt libXaw libXpm;
     inherit (gtkLibs) pango;
     inherit cairo pkgconfig;
+    texLive = null;
+    lua = null;
   };
 
   gnused = useFromStdenv "gnused"
@@ -872,6 +887,17 @@ let
     inherit (gtkLibs) pango;
   };
 
+  /* Readded by Michael Raskin. There are programs in the wild
+   * that do want 2.0 but not 2.22. Please give a day's notice for
+   * objections before removal.
+   */
+  graphviz_2_0 = import ../tools/graphics/graphviz/2.0.nix {
+    inherit fetchurl stdenv pkgconfig libpng libjpeg expat x11 yacc
+      libtool fontconfig gd;
+    inherit (xlibs) libXaw;
+    inherit (gtkLibs) pango;
+  };
+
   groff = import ../tools/text/groff {
     inherit fetchurl stdenv perl;
     ghostscript = null;
@@ -884,7 +910,7 @@ let
   };
 
   grub2 = import ../tools/misc/grub/1.9x.nix {
-    inherit stdenv fetchurl bison ncurses libusb freetype;
+    inherit stdenv fetchurl bison gettext ncurses libusb freetype qemu;
   };
 
   gssdp = import ../development/libraries/gssdp {
@@ -933,6 +959,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  hdf5 = import ../tools/misc/hdf5 {
+    inherit fetchurl stdenv;
+  };
+
   hevea = import ../tools/typesetting/hevea {
     inherit fetchurl stdenv ocaml;
   };
@@ -945,6 +975,11 @@ let
     inherit fetchurl stdenv;
   };
 
+  httpfs2 = import ../tools/filesystems/httpfs {
+    inherit fetchurl stdenv pkgconfig fuse openssl
+      asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt;
+  };
+
   iasl = import ../development/compilers/iasl {
     inherit fetchurl stdenv bison flex;
   };
@@ -1144,33 +1179,31 @@ let
     inherit stdenv fetchgit libuuid lzo zlib acl;
   };
 
-  multitran = recurseIntoAttrs (let
-      inherit fetchurl stdenv help2man;
-    in rec {
-      multitrandata = import ../tools/text/multitran/data {
-        inherit fetchurl stdenv;
-      };
+  multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec {
+    multitrandata = import ../tools/text/multitran/data {
+      inherit fetchurl stdenv;
+    };
 
-      libbtree = import ../tools/text/multitran/libbtree {
-        inherit fetchurl stdenv;
-      };
+    libbtree = import ../tools/text/multitran/libbtree {
+      inherit fetchurl stdenv;
+    };
 
-      libmtsupport = import ../tools/text/multitran/libmtsupport {
-        inherit fetchurl stdenv;
-      };
+    libmtsupport = import ../tools/text/multitran/libmtsupport {
+      inherit fetchurl stdenv;
+    };
 
-      libfacet = import ../tools/text/multitran/libfacet {
-        inherit fetchurl stdenv libmtsupport;
-      };
+    libfacet = import ../tools/text/multitran/libfacet {
+      inherit fetchurl stdenv libmtsupport;
+    };
 
-      libmtquery = import ../tools/text/multitran/libmtquery {
-        inherit fetchurl stdenv libmtsupport libfacet libbtree multitrandata;
-      };
+    libmtquery = import ../tools/text/multitran/libmtquery {
+      inherit fetchurl stdenv libmtsupport libfacet libbtree multitrandata;
+    };
 
-      mtutils = import ../tools/text/multitran/mtutils {
-        inherit fetchurl stdenv libmtsupport libfacet libbtree libmtquery help2man;
-      };
-    });
+    mtutils = import ../tools/text/multitran/mtutils {
+      inherit fetchurl stdenv libmtsupport libfacet libbtree libmtquery help2man;
+    };
+  });
 
   muscleframework = import ../tools/security/muscleframework {
     inherit fetchurl stdenv libmusclecard pkgconfig pcsclite;
@@ -1189,11 +1222,14 @@ let
   };
 
   nbd = import ../tools/networking/nbd {
-    inherit fetchurl stdenv pkgconfig glib;
+    inherit fetchurl stdenv pkgconfig;
+    glib = gtkLibs.glib.override {
+      stdenv = makeStaticBinaries stdenv;
+    };
   };
 
-  nc6 = composedArgsAndFun (import ../tools/networking/nc6/1.0.nix) {
-    inherit builderDefs;
+  nc6 = makeOverridable (import ../tools/networking/nc6) {
+    inherit fetchurl stdenv;
   };
 
   ncat = import ../tools/networking/ncat {
@@ -1252,6 +1288,11 @@ let
     inherit fetchurl stdenv libevent;
   };
 
+  obex_data_server = import ../tools/bluetooth/obex-data-server {
+    inherit fetchurl stdenv pkgconfig libusb dbus_glib bluez openobex;
+    inherit (gtkLibs) glib;
+  };
+
   obexd = import ../tools/bluetooth/obexd {
     inherit fetchurl stdenv pkgconfig dbus openobex bluez glib libical;
   };
@@ -1390,8 +1431,7 @@ let
   };
 
   pfstools = import ../tools/graphics/pfstools {
-    inherit fetchurl stdenv imagemagick libjpeg libtiff mesa freeglut bzip2 libpng expat;
-    openexr = openexr_1_6_1;
+    inherit fetchurl stdenv imagemagick libjpeg libtiff mesa freeglut bzip2 libpng expat openexr;
     qt = qt3;
     inherit (xlibs) libX11;
   };
@@ -1401,6 +1441,10 @@ let
     inherit (gnome) glib gtk;
   };
 
+  pius = import ../tools/security/pius {
+    inherit fetchurl stdenv python gnupg;
+  };
+
   pk2cmd = import ../tools/misc/pk2cmd {
     inherit fetchurl stdenv libusb makeWrapper;
   };
@@ -1448,7 +1492,7 @@ let
   };
 
   pstoedit = import ../tools/graphics/pstoedit {
-    inherit fetchurl stdenv lib pkgconfig ghostscript gd zlib plotutils;
+    inherit fetchurl stdenv pkgconfig ghostscript gd zlib plotutils;
   };
 
   pv = import ../tools/misc/pv {
@@ -1482,7 +1526,7 @@ let
   };
 
   openmpi = import ../development/libraries/openmpi {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv gfortran;
   };
 
   qdu = import ../tools/misc/qdu {
@@ -1508,10 +1552,10 @@ let
   };
 
   reiserfsprogs = import ../tools/filesystems/reiserfsprogs {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv libuuid;
   };
 
-  relfs = composedArgsAndFun (import ../tools/filesystems/relfs) {
+  relfs = makeOverridable (import ../tools/filesystems/relfs) {
     inherit fetchcvs stdenv ocaml postgresql fuse pcre
       builderDefs pkgconfig libuuid;
     inherit (gnome) gnomevfs GConf;
@@ -1540,8 +1584,8 @@ let
     logger = inetutils;
   };
 
-  rlwrap = composedArgsAndFun (import ../tools/misc/rlwrap/0.28.nix) {
-    inherit builderDefs readline;
+  rlwrap = makeOverridable (import ../tools/misc/rlwrap) {
+    inherit fetchurl stdenv readline;
   };
 
   rpPPPoE = builderDefsPackage (import ../tools/networking/rp-pppoe) {
@@ -1623,8 +1667,8 @@ let
     inherit fetchurl stdenv;
   };
 
-  smbfsFuse = composedArgsAndFun (import ../tools/filesystems/smbfs-fuse) {
-    inherit builderDefs samba fuse;
+  fusesmb = makeOverridable (import ../tools/filesystems/fusesmb) {
+    inherit fetchurl stdenv samba fuse;
   };
 
   socat = import ../tools/networking/socat {
@@ -1659,12 +1703,12 @@ let
     tlsSupport = true;
   };
 
-  ssss = composedArgsAndFun (import ../tools/security/ssss/0.5.nix) {
-    inherit builderDefs gmp;
+  ssss = makeOverridable (import ../tools/security/ssss) {
+    inherit fetchurl stdenv gmp;
   };
 
   stun = import ../tools/networking/stun {
-    inherit fetchurl stdenv lib;
+    inherit fetchurl stdenv;
   };
 
   stunnel = import ../tools/networking/stunnel {
@@ -1692,7 +1736,8 @@ let
   };
 
   privoxy = import ../tools/networking/privoxy {
-    inherit fetchurl stdenv autoconf automake zlib pcre w3m;
+    inherit fetchurl stdenv automake zlib pcre w3m;
+    autoconf = autoconf213;
   };
 
   tcpdump = import ../tools/networking/tcpdump {
@@ -1768,6 +1813,14 @@ let
     inherit fetchcvs stdenv autoconf automake libtool;
   };
 
+  tigervnc = import ../tools/admin/tigervnc {
+    inherit fetchsvn stdenv gettext autoconf automake cvs libtool nasm xkeyboard_config;
+    inherit (xorg) libX11 libXext libICE libXtst libXi libSM xorgserver utilmacros pixman xkbcomp
+      fontutil;
+    fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
+      xorg.fontbhlucidatypewriter75dpi ];
+  };
+
   tightvnc = import ../tools/admin/tightvnc {
     inherit fetchurl stdenv x11 zlib libjpeg perl;
     inherit (xlibs) imake gccmakedep libXmu libXaw libXpm libXp xauth;
@@ -1843,7 +1896,7 @@ let
   };
 
   w3cCSSValidator = import ../tools/misc/w3c-css-validator {
-    inherit fetchurl stdenv apacheAnt jre sourceFromHead lib;
+    inherit fetchurl stdenv apacheAnt jre sourceFromHead;
     tomcat = tomcat6;
   };
 
@@ -1893,6 +1946,38 @@ let
     inherit (xorg) imake;
   };
 
+  xbursttools = import ../tools/misc/xburst-tools {
+    inherit stdenv fetchgit autoconf automake libusb confuse;
+    # It needs a cross compiler for mipsel to build the firmware it will
+    # load into the Ben Nanonote
+    gccCross = let
+        pkgsCross = (import ./all-packages.nix) {
+          inherit system;
+          inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
+          # Ben Nanonote system
+          crossSystem = {
+            config = "mipsel-unknown-linux";  
+            bigEndian = true;
+            arch = "mips";
+            float = "soft";
+            withTLS = true;
+            libc = "uclibc";
+            platform = {
+              name = "ben_nanonote";
+              kernelMajor = "2.6";
+              # It's not a bcm47xx processor, but for the headers this should work
+              kernelHeadersBaseConfig = "bcm47xx_defconfig";
+              kernelArch = "mips";
+            };
+            gcc = {
+              arch = "mips32";
+            };
+          };
+        };
+      in 
+        pkgsCross.gccCrossStageStatic;
+  };
+
   xclip = import ../tools/misc/xclip {
     inherit fetchurl stdenv x11;
     inherit (xlibs) libXmu;
@@ -1954,6 +2039,7 @@ let
 
   bashReal = makeOverridable (import ../shells/bash) {
     inherit fetchurl stdenv bison;
+    texinfo = null;
   };
 
   bashInteractive = appendToName "interactive" (bashReal.override {
@@ -2019,12 +2105,12 @@ let
     inherit gmp mpfr;
   };
 
-  adobeFlexSDK33 = import ../development/compilers/adobe-flex-sdk {
-    inherit fetchurl stdenv unzip jre;
+  adobe_flex_sdk = import ../development/compilers/adobe-flex-sdk {
+    inherit fetchurl stdenv unzip;
   };
 
   fpc = import ../development/compilers/fpc {
-    inherit fetchurl stdenv gawk system;
+    inherit fetchurl stdenv gawk;
   };
 
   gambit = import ../development/compilers/gambit {
@@ -2310,16 +2396,18 @@ let
     enableMultilib = false;
   }));
 
-  /*
-  Broken; fails because of unability to find its own symbols during linking
-
   gcl = builderDefsPackage ../development/compilers/gcl {
-    inherit mpfr m4 binutils fetchcvs emacs;
+    inherit mpfr m4 binutils fetchcvs emacs zlib which
+      gmp texinfo;
     inherit (xlibs) libX11 xproto inputproto libXi
       libXext xextproto libXt libXaw libXmu;
-    stdenv = (overrideGCC stdenv gcc34) // {gcc = gcc33;};
+    inherit stdenv;
+    texLive = texLiveAggregationFun {
+      paths = [
+        texLive texLiveExtra
+      ];
+    };
   };
-  */
 
   # GHC
 
@@ -2347,7 +2435,7 @@ let
   # packages.
 
   # This should point to the current default version.
-  haskellPackages = haskellPackages_ghc6104;
+  haskellPackages = haskellPackages_ghc6123;
 
   # Old versions of ghc that currently don't build because the binary
   # is broken.
@@ -2432,12 +2520,14 @@ let
   haskellPackages_ghc6104 =
     haskellPackagesFun610 ../development/compilers/ghc/6.10.4.nix false;
 
-  # We will soon switch to either ghc-6.12.1 or ghc-6.12.2 as default.
-  haskellPackages_ghc6121 = lowPrio
-    (haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false);
+  haskellPackages_ghc6121 =
+    haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false;
 
-  haskellPackages_ghc6122 = lowPrio
-    (haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false);
+  haskellPackages_ghc6122 =
+    haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false;
+
+  haskellPackages_ghc6123 =
+    haskellPackagesFun612 ../development/compilers/ghc/6.12.3.nix false;
 
   # Currently not pointing to the actual HEAD, therefore disabled
   /*
@@ -2483,7 +2573,12 @@ let
   #TODO add packages http://cvs.haskell.org/Hugs/downloads/2006-09/packages/ and test
   # commented out because it's using the new configuration style proposal which is unstable
   hugs = import ../development/compilers/hugs {
-    inherit lib fetchurl stdenv composableDerivation;
+    inherit fetchurl composableDerivation;
+  };
+
+  path64 = import ../development/compilers/path64 {
+    inherit fetchgit perl flex bison gmp mpfr cmake;
+    stdenv = stdenv2;
   };
 
   openjdkDarwin = import ../development/compilers/openjdk-darwin {
@@ -2551,7 +2646,7 @@ let
   };
 
   neko = import ../development/compilers/neko {
-    inherit sourceFromHead fetchurl stdenv lib pkgconfig composableDerivation
+    inherit sourceFromHead fetchurl lib pkgconfig composableDerivation
       boehmgc apacheHttpd mysql zlib sqlite pcre apr makeWrapper;
     inherit (gtkLibs) gtk;
   };
@@ -2563,11 +2658,7 @@ let
   ocaml = ocaml_3_11_1;
 
   ocaml_3_08_0 = import ../development/compilers/ocaml/3.08.0.nix {
-    inherit fetchurl stdenv fetchcvs x11 ncurses;
-  };
-
-  ocaml_3_09_1 = import ../development/compilers/ocaml/3.09.1.nix {
-    inherit fetchurl stdenv x11 ncurses;
+    inherit fetchurl stdenv x11;
   };
 
   ocaml_3_10_0 = import ../development/compilers/ocaml/3.10.0.nix {
@@ -2590,10 +2681,7 @@ let
   };
 
   roadsend = import ../development/compilers/roadsend {
-    inherit fetchurl stdenv flex bison bigloo lib curl composableDerivation;
-    # optional features
-    # all features pcre, fcgi xml mysql, sqlite3, (not implemented: odbc gtk gtk2)
-    flags = ["pcre" "xml" "mysql"];
+    inherit fetchurl bigloo curl composableDerivation;
     inherit mysql libxml2 fcgi;
   };
 
@@ -2640,9 +2728,17 @@ let
     inherit fetchurl stdenv perl texinfo;
   };
 
-  visualcpp = (import ../development/compilers/visual-c++ {
+  vala = import ../development/compilers/vala {
+    inherit stdenv fetchurl yacc flex glib pkgconfig;
+  };
+
+  visualcpp = import ../development/compilers/visual-c++ {
     inherit fetchurl stdenv cabextract;
-  });
+  };
+
+  vs90wrapper = import ../development/compilers/vs90wrapper {
+    inherit stdenv;
+  };
 
   webdsl = import ../development/compilers/webdsl {
     inherit stdenv fetchurl pkgconfig strategoPackages;
@@ -2719,6 +2815,10 @@ let
     inherit fetchurl stdenv perl gnum4 ncurses openssl;
   };
 
+  erlangR13B = import ../development/interpreters/erlang/R13B.nix {
+    inherit fetchurl stdenv perl gnum4 ncurses openssl;
+  };
+
   groovy = import ../development/interpreters/groovy {
     inherit stdenv fetchurl unzip;
   };
@@ -2766,10 +2866,9 @@ let
   # mercurial (hg) bleeding edge version
   octaveHG = import ../development/interpreters/octave/hg.nix {
     inherit fetchurl sourceFromHead readline ncurses perl flex atlas getConfig glibc qhull gfortran;
-    inherit automake autoconf bison gperf lib python gnuplot texinfo texLive; # for dev Version
+    inherit automake autoconf bison gperf lib python gnuplot texinfo texLive;
     inherit stdenv;
     inherit (xlibs) libX11;
-    #stdenv = overrideGCC stdenv gcc40;
   };
 
   perl58 = import ../development/interpreters/perl-5.8 {
@@ -2785,17 +2884,10 @@ let
   perl = useFromStdenv "perl"
     (if system != "i686-cygwin" then perl510 else sysPerl);
 
-  # FIXME: unixODBC needs patching on Darwin (see darwinports)
-  phpOld = import ../development/interpreters/php {
-    inherit stdenv fetchurl flex bison libxml2 apacheHttpd;
-    unixODBC =
-      if stdenv.isDarwin then null else unixODBC;
-  };
-
-  php = makeOverridable (import ../development/interpreters/php_configurable) {
+  php = makeOverridable (import ../development/interpreters/php) {
     inherit
       stdenv fetchurl lib composableDerivation autoconf automake
-      flex bison apacheHttpd mysql libxml2 # gettext
+      flex bison apacheHttpd mysql libxml2
       zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv libjpeg libpng;
   };
 
@@ -2870,14 +2962,14 @@ let
   pyrex = pyrex095;
 
   pyrex095 = import ../development/interpreters/pyrex/0.9.5.nix {
-    inherit fetchurl stdenv stringsWithDeps lib builderDefs python;
+    inherit fetchurl stdenv builderDefs python;
   };
 
   pyrex096 = import ../development/interpreters/pyrex/0.9.6.nix {
-    inherit fetchurl stdenv stringsWithDeps lib builderDefs python;
+    inherit fetchurl stdenv builderDefs python;
   };
 
-  Qi = composedArgsAndFun (import ../development/compilers/qi/9.1.nix) {
+  qi = makeOverridable (import ../development/compilers/qi) {
     inherit clisp stdenv fetchurl builderDefs unzip;
   };
 
@@ -2933,7 +3025,7 @@ let
   xulrunnerWrapper = {application, launcher}:
     import ../development/interpreters/xulrunner/wrapper {
       inherit stdenv application launcher;
-      xulrunner = xulrunner35;
+      xulrunner = firefox36Pkgs.xulrunner;
     };
 
 
@@ -3056,7 +3148,7 @@ let
   };
 
   avrdude = import ../development/tools/misc/avrdude {
-    inherit lib fetchurl stdenv flex yacc composableDerivation texLive;
+    inherit fetchurl flex yacc composableDerivation texLive;
   };
 
   binutils = useFromStdenv "binutils"
@@ -3270,7 +3362,7 @@ let
   };
 
   inotifyTools = import ../development/tools/misc/inotify-tools {
-    inherit fetchurl stdenv lib;
+    inherit fetchurl stdenv;
   };
 
   ired = import ../development/tools/analysis/radare/ired.nix {
@@ -3299,8 +3391,8 @@ let
     inherit fetchurl stdenv;
   };
 
-  ltrace = composedArgsAndFun (import ../development/tools/misc/ltrace/0.5-3deb.nix) {
-    inherit fetchurl stdenv builderDefs stringsWithDeps lib elfutils;
+  ltrace = makeOverridable (import ../development/tools/misc/ltrace) {
+    inherit fetchurl stdenv elfutils;
   };
 
   mig = import ../os-specific/gnu/mig {
@@ -3312,7 +3404,7 @@ let
   };
 
   noweb = import ../development/tools/literate-programming/noweb {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv gawk;
   };
 
   omake = import ../development/tools/ocaml/omake {
@@ -3387,7 +3479,7 @@ let
 
   # couldn't find the source yet
   seleniumRCBin = import ../development/tools/selenium/remote-control {
-    inherit fetchurl stdenv unzip;
+    inherit fetchurl stdenv;
     jre = jdk;
   };
 
@@ -3426,7 +3518,7 @@ let
   swigWithJava = swig;
 
   swftools = import ../tools/video/swftools {
-    inherit fetchurl stdenv x264 zlib libjpeg freetype giflib;
+    inherit fetchurl stdenv zlib;
   };
 
   texinfo49 = import ../development/tools/misc/texinfo/4.9.nix {
@@ -3510,11 +3602,11 @@ let
   };
 
   apr = makeOverridable (import ../development/libraries/apr) {
-    inherit (pkgsOverriden) fetchurl stdenv;
+    inherit fetchurl stdenv;
   };
 
   aprutil = makeOverridable (import ../development/libraries/apr-util) {
-    inherit (pkgsOverriden) fetchurl stdenv apr expat db4;
+    inherit fetchurl stdenv apr expat db4;
     bdbSupport = true;
   };
 
@@ -3567,7 +3659,7 @@ let
   };
 
   boolstuff = import ../development/libraries/boolstuff {
-    inherit fetchurl stdenv lib pkgconfig;
+    inherit fetchurl stdenv pkgconfig;
   };
 
   boost = makeOverridable (import ../development/libraries/boost) {
@@ -3603,7 +3695,7 @@ let
   };
 
   ccrtp = import ../development/libraries/ccrtp {
-    inherit fetchurl stdenv lib pkgconfig openssl libgcrypt commoncpp2;
+    inherit fetchurl stdenv pkgconfig openssl libgcrypt commoncpp2;
   };
 
   chipmunk = builderDefsPackage (import ../development/libraries/chipmunk) {
@@ -3629,6 +3721,11 @@ let
     inherit (xlibs) libX11 xf86vidmodeproto libXmu libXxf86vm;
   };
 
+  clapack = import ../development/libraries/clapack {
+    inherit fetchurl cmake;
+    stdenv = stdenv2;
+  };
+
   classads = import ../development/libraries/classads {
     inherit fetchurl stdenv;
   };
@@ -3652,10 +3749,25 @@ let
     inherit fetchurl stdenv;
   };
 
+  clutter = import ../development/libraries/clutter {
+    inherit fetchurl stdenv pkgconfig mesa cairo;
+    inherit (gnome) glib pango gtk;
+    inherit (xorg) libXi libXfixes libXdamage libXcomposite;
+  };
+
+  clutter_gtk = import ../development/libraries/clutter-gtk {
+    inherit fetchurl stdenv pkgconfig clutter;
+    inherit (gnome) gtk;
+  };
+
   commoncpp2 = import ../development/libraries/commoncpp2 {
     inherit stdenv fetchurl;
   };
 
+  confuse = import ../development/libraries/confuse {
+    inherit fetchurl stdenv;
+  };
+
   consolekit = makeOverridable (import ../development/libraries/consolekit) {
     inherit stdenv fetchurl pkgconfig dbus_glib zlib pam polkit expat glib;
     inherit (xlibs) libX11;
@@ -3735,6 +3847,10 @@ let
     inherit fetchurl stdenv libp11 pkgconfig openssl;
   };
 
+  esdl = import ../development/libraries/esdl {
+    inherit stdenv fetchurl erlang SDL mesa;
+  };
+
   exiv2 = import ../development/libraries/exiv2 {
     inherit fetchurl stdenv zlib;
   };
@@ -3780,7 +3896,7 @@ let
 
   ffmpeg = import ../development/libraries/ffmpeg {
     inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig xvidcore
-      lame yasm;
+      lame yasm libvpx;
   };
 
   fftw = import ../development/libraries/fftw {
@@ -3794,17 +3910,15 @@ let
   };
 
   fltk11 = (import ../development/libraries/fltk/fltk11.nix) {
-    inherit composableDerivation x11 lib pkgconfig freeglut;
-    inherit fetchurl stdenv mesa libpng libjpeg zlib ;
+    inherit composableDerivation x11 pkgconfig freeglut;
+    inherit fetchurl mesa libpng libjpeg zlib ;
     inherit (xlibs) inputproto libXi libXinerama libXft;
-    flags = [ "useNixLibs" "threads" "shared" "gl" ];
   };
 
   fltk20 = (import ../development/libraries/fltk) {
-    inherit composableDerivation x11 lib pkgconfig freeglut;
-    inherit fetchurl stdenv mesa libpng libjpeg zlib ;
+    inherit composableDerivation x11 pkgconfig freeglut;
+    inherit fetchurl mesa libpng libjpeg zlib;
     inherit (xlibs) inputproto libXi libXinerama libXft;
-    flags = [ "useNixLibs" "threads" "shared" "gl" ];
   };
 
   fmod = import ../development/libraries/fmod {
@@ -3870,7 +3984,6 @@ let
 
   gegl = import ../development/libraries/gegl {
     inherit fetchurl stdenv libpng pkgconfig babl;
-    openexr = openexr_1_6_1;
     #  avocodec avformat librsvg
     inherit cairo libjpeg librsvg;
     inherit (gtkLibs) pango glib gtk;
@@ -3885,9 +3998,7 @@ let
   };
 
   geos = import ../development/libraries/geos {
-    inherit fetchurl fetchsvn stdenv autoconf
-      automake libtool swig which lib composableDerivation python ruby;
-    use_svn = stdenv.system == "x86_64-linux";
+    inherit composableDerivation fetchurl python;
   };
 
   gettext = import ../development/libraries/gettext/default.nix {
@@ -3908,13 +4019,13 @@ let
   };
 
   glew = import ../development/libraries/glew {
-    inherit fetchurl stdenv mesa x11 libtool;
+    inherit fetchurl stdenv mesa x11;
     inherit (xlibs) libXmu libXi;
   };
 
-  glefw = import ../development/libraries/glefw {
-    inherit fetchurl stdenv lib mesa;
-    inherit (xlibs) libX11 libXext xextproto;
+  glfw = import ../development/libraries/glfw {
+    inherit fetchurl stdenv mesa;
+    inherit (xlibs) libX11 libXext;
   };
 
   glibc = useFromStdenv "glibc" glibc211;
@@ -3948,6 +4059,9 @@ let
     inherit fetchurl stdenv;
     kernelHeaders = linuxHeaders;
     installLocales = getPkgConfig "glibc" "locales" false;
+    machHeaders = null;
+    hurdHeaders = null;
+    gccCross = null;
   };
 
   glibc211Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11)
@@ -3975,6 +4089,10 @@ let
 
   libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
 
+  libdbusmenu_qt = makeOverridable (import ../development/libraries/libdbusmenu-qt) {
+    inherit stdenv fetchurl qt4 cmake;
+  };
+
   libdwg = import ../development/libraries/libdwg {
     inherit stdenv fetchurl;
   };
@@ -4023,6 +4141,10 @@ let
     inherit fetchurl stdenv pkgconfig zlib glib;
   };
 
+  gmime_2_2 = import ../development/libraries/gmime/2.2.x.nix {
+    inherit fetchurl stdenv pkgconfig zlib glib;
+  };
+
   gmm = import ../development/libraries/gmm {
     inherit fetchurl stdenv;
   };
@@ -4114,11 +4236,11 @@ let
     inherit (gnome) gtk;
   };
 
-  gtkLibs = recurseIntoAttrs gtkLibs218;
+  gtkLibs = gtkLibs220;
 
   glib = gtkLibs.glib;
 
-  gtkLibs1x = rec {
+  gtkLibs1x = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs1x; in rec {
 
     glib = import ../development/libraries/glib/1.2.x.nix {
       inherit fetchurl stdenv;
@@ -4128,9 +4250,9 @@ let
       inherit fetchurl stdenv x11 glib;
     };
 
-  };
+  });
 
-  gtkLibs216 = rec {
+  gtkLibs216 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs216; in rec {
 
     glib = import ../development/libraries/glib/2.20.x.nix {
       inherit fetchurl stdenv pkgconfig gettext perl;
@@ -4161,13 +4283,13 @@ let
       inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm;
     };
 
-  };
+  });
 
-  gtkLibs218 = rec {
+  gtkLibs218 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs218; in rec {
 
     glib = import ../development/libraries/glib/2.22.x.nix {
       inherit fetchurl stdenv pkgconfig gettext perl;
-      libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null;
+      libiconv = if stdenv.system == "i686-freebsd" then libiconv else null;
     };
 
     glibmm = import ../development/libraries/glibmm/2.22.x.nix {
@@ -4195,7 +4317,41 @@ let
       inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm;
     };
 
-  };
+  });
+
+  gtkLibs220 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs220; in rec {
+
+    glib = makeOverridable (import ../development/libraries/glib/2.24.x.nix) {
+      inherit fetchurl stdenv pkgconfig gettext perl zlib;
+      libiconv = if stdenv.system == "i686-freebsd" then libiconv else null;
+    };
+
+    glibmm = import ../development/libraries/glibmm/2.22.x.nix {
+      inherit fetchurl stdenv pkgconfig glib libsigcxx;
+    };
+
+    atk = import ../development/libraries/atk/1.30.x.nix {
+      inherit fetchurl stdenv pkgconfig perl glib;
+    };
+
+    pango = import ../development/libraries/pango/1.28.x.nix {
+      inherit fetchurl stdenv pkgconfig gettext x11 glib cairo libpng;
+    };
+
+    pangomm = import ../development/libraries/pangomm/2.26.x.nix {
+      inherit fetchurl stdenv pkgconfig pango glibmm cairomm libpng;
+    };
+
+    gtk = import ../development/libraries/gtk+/2.20.x.nix {
+      inherit fetchurl stdenv pkgconfig perl jasper glib atk pango
+        libtiff libjpeg libpng cairo xlibs cups;
+    };
+
+    gtkmm = import ../development/libraries/gtkmm/2.18.x.nix {
+      inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm;
+    };
+
+  });
 
   gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp {
     inherit fetchurl stdenv mono pkgconfig monoDLLFixer;
@@ -4240,6 +4396,10 @@ let
     inherit stdenv fetchurl unzip;
   };
 
+  hunspell = makeOverridable (import ../development/libraries/hunspell) {
+    inherit fetchurl stdenv ncurses readline;
+  };
+
   hwloc = import ../development/libraries/hwloc {
     inherit fetchurl stdenv pkgconfig cairo expat ncurses;
   };
@@ -4398,6 +4558,11 @@ let
     inherit fetchurl stdenv libcddb pkgconfig ncurses help2man;
   };
 
+  libchamplain = import ../development/libraries/libchamplain {
+    inherit fetchurl stdenv pkgconfig cairo clutter clutter_gtk sqlite;
+    inherit (gnome) gtk glib libsoup;
+  };
+
   libcm = import ../development/libraries/libcm {
     inherit fetchurl stdenv pkgconfig xlibs mesa glib;
   };
@@ -4415,20 +4580,22 @@ let
     inherit fetchurl stdenv;
   };
 
-  libdbi = composedArgsAndFun (import ../development/libraries/libdbi/0.8.2.nix) {
-    inherit stdenv fetchurl builderDefs;
+  libdbi = makeOverridable (import ../development/libraries/libdbi) {
+    inherit stdenv fetchurl;
   };
 
-  libdbiDriversBase = composedArgsAndFun (import ../development/libraries/libdbi-drivers/0.8.2-1.nix) {
-    inherit stdenv fetchurl builderDefs libdbi;
+  libdbiDriversBase = makeOverridable (import ../development/libraries/libdbi-drivers) {
+    inherit stdenv fetchurl libdbi;
+    mysql = null;
+    sqlite = null;
   };
 
-  libdbiDrivers = libdbiDriversBase.passthru.function {
+  libdbiDrivers = libdbiDriversBase.override {
     inherit sqlite mysql;
   };
 
   libdv = import ../development/libraries/libdv {
-    inherit fetchurl stdenv lib composableDerivation;
+    inherit fetchurl composableDerivation;
   };
 
   libdrm = if stdenv.isDarwin then null else (import ../development/libraries/libdrm {
@@ -4511,7 +4678,7 @@ let
   };
 
   libharu = import ../development/libraries/libharu {
-    inherit fetchurl stdenv lib zlib libpng;
+    inherit fetchurl stdenv zlib libpng;
   };
 
   libical = import ../development/libraries/libical {
@@ -4540,7 +4707,7 @@ let
   };
 
   libsamplerate = import ../development/libraries/libsamplerate {
-    inherit fetchurl stdenv pkgconfig lib;
+    inherit fetchurl stdenv libsndfile fftw pkgconfig;
   };
 
   libspectre = import ../development/libraries/libspectre {
@@ -4570,6 +4737,13 @@ let
     inherit fetchurl stdenv pkgconfig libraw1394;
   };
 
+  libinfinity = makeOverridable (import ../development/libraries/libinfinity) {
+    inherit stdenv fetchurl pkgconfig;
+    inherit (gtkLibs) gtk glib;
+    inherit (gnome) gtkdoc;
+    inherit libxml2 gnutls gsasl avahi libdaemon;
+  };
+
   libiptcdata = import ../development/libraries/libiptcdata {
     inherit fetchurl stdenv;
   };
@@ -4582,6 +4756,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  libjpeg_turbo = makeOverridable (import ../development/libraries/libjpeg-turbo) {
+    inherit fetchurl stdenv nasm;
+  };
+
   libjpeg62 = makeOverridable (import ../development/libraries/libjpeg/62.nix) {
     inherit fetchurl stdenv;
     libtool = libtool_1_5;
@@ -4620,7 +4798,7 @@ let
   };
 
   libmng = import ../development/libraries/libmng {
-    inherit fetchurl stdenv lib zlib libpng libjpeg lcms automake autoconf libtool;
+    inherit fetchurl stdenv zlib libpng libjpeg lcms automake autoconf libtool;
   };
 
   libmpcdec = import ../development/libraries/libmpcdec {
@@ -4700,7 +4878,7 @@ let
   };
 
   # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
-  libsigsegv_25 =  import ../development/libraries/libsigsegv/2.5.nix {
+  libsigsegv_25 = import ../development/libraries/libsigsegv/2.5.nix {
     inherit fetchurl stdenv;
   };
 
@@ -4781,7 +4959,7 @@ let
   };
 
   libvpx = import ../development/libraries/libvpx {
-    inherit fetchurl stdenv bash;
+    inherit fetchurl stdenv bash yasm;
   };
 
   libvterm = import ../development/libraries/libvterm {
@@ -4830,6 +5008,12 @@ let
     pythonSupport = true;
   };
 
+  libxmlxx = import ../development/libraries/libxmlxx {
+    inherit stdenv fetchurl;
+    inherit pkgconfig libxml2 perl;
+    inherit (gtkLibs) glibmm;
+  };
+
   libxslt = makeOverridable (import ../development/libraries/libxslt) {
     inherit fetchurl stdenv libxml2;
   };
@@ -4847,7 +5031,7 @@ let
   };
 
   libzrtpcpp = import ../development/libraries/libzrtpcpp {
-    inherit fetchurl stdenv lib commoncpp2 openssl pkgconfig ccrtp;
+    inherit fetchurl stdenv commoncpp2 openssl pkgconfig ccrtp;
   };
 
   lightning = import ../development/libraries/lightning {
@@ -4878,7 +5062,7 @@ let
   };
 
   # failed to build
-  mediastreamer = composedArgsAndFun (import ../development/libraries/mediastreamer/2.2.0-cvs20080207.nix) {
+  mediastreamer = makeOverridable (import ../development/libraries/mediastreamer) {
     inherit fetchurl stdenv automake libtool autoconf alsaLib pkgconfig speex
       ortp ffmpeg;
   };
@@ -4924,7 +5108,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  ncurses = makeOverridable (composedArgsAndFun (import ../development/libraries/ncurses)) {
+  ncurses = makeOverridable (import ../development/libraries/ncurses) {
     inherit fetchurl stdenv;
     # The "! (stdenv ? cross)" is for the cross-built arm ncurses, which
     # don't build for me in unicode.
@@ -4975,8 +5159,8 @@ let
   };
 
   # added because I hope that it has been easier to compile on x86 (for blender)
-  openalSoft = import ../development/libraries/openalSoft {
-    inherit fetchurl stdenv alsaLib libtool cmake;
+  openalSoft = import ../development/libraries/openal-soft {
+    inherit fetchurl stdenv alsaLib cmake;
   };
 
   openbabel = import ../development/libraries/openbabel {
@@ -5001,25 +5185,14 @@ let
 
   # this ctl version is needed by openexr_viewers
   openexr_ctl = import ../development/libraries/openexr_ctl {
-    inherit fetchurl stdenv ilmbase ctl;
-    openexr = openexr_1_6_1;
+    inherit fetchurl stdenv ilmbase ctl openexr;
   };
 
-  openexr_1_6_1 = import ../development/libraries/openexr {
-    inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
-    version = "1.6.1";
-    # optional features:
+  openexr = import ../development/libraries/openexr {
+    inherit fetchurl stdenv ilmbase zlib pkgconfig;
     inherit ctl;
   };
 
-  # This older version is needed by blender (it complains about missing half.h )
-  openexr_1_4_0 = import ../development/libraries/openexr {
-    inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
-    version = "1.4.0";
-  };
-
-  openexr = openexr_1_6_1;
-
   openldap = import ../development/libraries/openldap {
     inherit fetchurl stdenv openssl cyrus_sasl db4 groff;
   };
@@ -5042,11 +5215,6 @@ let
     inherit stdenv perl;
   };
 
-  openssl1 = makeOverridable (import ../development/libraries/openssl/1.x.nix) {
-    fetchurl = fetchurlBoot;
-    inherit stdenv perl;
-  };
-
   ortp = import ../development/libraries/ortp {
     inherit fetchurl stdenv;
   };
@@ -5101,7 +5269,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  proj = import ../development/libraries/proj.4 {
+  proj = import ../development/libraries/proj {
     inherit fetchurl stdenv;
   };
 
@@ -5114,6 +5282,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  qjson = makeOverridable (import ../development/libraries/qjson) {
+    inherit stdenv fetchurl qt4 cmake;
+  };
+
   qt3 = makeOverridable (import ../development/libraries/qt-3) {
     inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
@@ -5129,7 +5301,7 @@ let
   qt4 = qt46;
 
   qt45 = import ../development/libraries/qt-4.x/4.5 {
-    inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
+    inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups dbus
       fontconfig freetype pkgconfig libtiff;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
       libXmu libXinerama xineramaproto libXcursor libXext
@@ -5138,7 +5310,7 @@ let
   };
 
   qt46 = makeOverridable (import ../development/libraries/qt-4.x/4.6) {
-    inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
+    inherit fetchurl stdenv zlib libjpeg libpng which mysql mesa openssl cups dbus
       fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib
       postgresql;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
@@ -5148,9 +5320,9 @@ let
   };
 
   qt47 = makeOverridable (import ../development/libraries/qt-4.x/4.7) {
-    inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus
-      fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib
-      postgresql pulseaudio;
+    inherit fetchurl stdenv zlib libjpeg libpng libmng which mysql mesa openssl
+      cups dbus fontconfig freetype pkgconfig libtiff perl coreutils sqlite
+      alsaLib postgresql pulseaudio;
     inherit (gst_all) gstreamer gstPluginsBase;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
       libXmu libXinerama xineramaproto libXcursor libXext libXi
@@ -5163,6 +5335,11 @@ let
     qt4 = qt46;
   };
 
+  quassel = makeOverridable (import ../applications/networking/irc/quassel) {
+    inherit stdenv fetchurl cmake;
+    inherit (kde4) qt4 kdelibs phonon automoc4;
+  };
+
   quesoglc = import ../development/libraries/quesoglc {
     inherit stdenv fetchurl mesa glew freetype fontconfig fribidi;
     inherit (xlibs) libX11;
@@ -5183,21 +5360,26 @@ let
   };
 
   librdf_raptor = import ../development/libraries/librdf/raptor.nix {
-    inherit fetchurl stdenv lib libxml2 curl;
+    inherit fetchurl stdenv libxml2 curl;
   };
 
   librdf_rasqal = import ../development/libraries/librdf/rasqal.nix {
-    inherit fetchurl stdenv lib pcre libxml2 gmp librdf_raptor;
+    inherit fetchurl stdenv pcre libxml2 gmp librdf_raptor pkgconfig;
   };
 
   librdf = import ../development/libraries/librdf {
-    inherit fetchurl stdenv lib pkgconfig librdf_raptor ladspaH openssl zlib;
+    inherit fetchurl stdenv pkgconfig librdf_raptor ladspaH openssl zlib;
+  };
+
+  qrupdate = import ../development/libraries/qrupdate { 
+      inherit stdenv fetchurl gfortran blas liblapack;
   };
 
   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;
+    postgresql = null;
   };
 
   rhino = import ../development/libraries/java/rhino {
@@ -5212,7 +5394,7 @@ let
   };
 
   rubberband = import ../development/libraries/rubberband {
-    inherit fetchurl stdenv lib pkgconfig libsamplerate libsndfile ladspaH;
+    inherit fetchurl stdenv pkgconfig libsamplerate libsndfile ladspaH;
     fftw = fftwSinglePrec;
     inherit (vamp) vampSDK;
   };
@@ -5246,6 +5428,10 @@ let
     inherit fetchurl stdenv SDL;
   };
 
+  SDL_sound = import ../development/libraries/SDL_sound {
+    inherit fetchurl stdenv SDL libvorbis flac libmikmod;
+  };
+
   SDL_ttf = import ../development/libraries/SDL_ttf {
     inherit fetchurl stdenv SDL freetype;
   };
@@ -5262,25 +5448,31 @@ let
   snack = import ../development/libraries/snack {
     inherit fetchurl stdenv tcl tk pkgconfig x11;
         # optional
-    inherit alsaLib vorbisTools python;
+    inherit vorbisTools python;
   };
 
   speex = import ../development/libraries/speex {
     inherit fetchurl stdenv libogg;
   };
 
-  sqlite = lowPrio (import ../development/libraries/sqlite {
+  sqlite = makeOverridable (import ../development/libraries/sqlite) {
     inherit fetchurl stdenv;
-  });
+    readline = null;
+    ncurses = null;
+  };
 
-  sqliteInteractive = lowPrio (appendToName "interactive" (import ../development/libraries/sqlite {
-    inherit fetchurl stdenv readline ncurses;
+  sqliteInteractive = lowPrio (appendToName "interactive" (sqlite.override {
+    inherit readline ncurses;
   }));
 
   stlport =  import ../development/libraries/stlport {
     inherit fetchurl stdenv;
   };
 
+  suitesparse = import ../development/libraries/suitesparse {
+    inherit fetchurl stdenv blas liblapack;  	
+  };
+
   t1lib = import ../development/libraries/t1lib {
     inherit fetchurl stdenv x11;
     inherit (xlibs) libXaw libXpm;
@@ -5336,7 +5528,11 @@ let
   });
 
   vamp = import ../development/libraries/audio/vamp {
-    inherit fetchurl stdenv lib pkgconfig libsndfile;
+    inherit fetchurl stdenv pkgconfig libsndfile;
+  };
+
+  vigra = import ../development/libraries/vigra {
+   inherit fetchurl stdenv cmake libtiff libpng libjpeg doxygen python fftw;
   };
 
   vtk = import ../development/libraries/vtk {
@@ -5348,18 +5544,19 @@ let
    inherit fetchurl stdenv cmake unzip libtiff expat zlib libpng libjpeg;
   };
 
-  webkit = builderDefsPackage (import ../development/libraries/webkit) {
+  webkit = ((builderDefsPackage ../development/libraries/webkit {
     inherit (gnome28) gtkdoc libsoup;
     inherit (gtkLibs) gtk atk pango glib;
     inherit freetype fontconfig gettext gperf curl
       libjpeg libtiff libpng libxml2 libxslt sqlite
       icu cairo perl intltool automake libtool
-      pkgconfig autoconf bison libproxy enchant;
+      pkgconfig autoconf bison libproxy enchant
+      python ruby;
     inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
       gstPluginsGood;
     flex = flex2535;
     inherit (xlibs) libXt;
-  };
+  }).deepOverride {libsoup = gnome28.libsoup_2_31;});
 
   wvstreams = import ../development/libraries/wvstreams {
     inherit stdenv fetchurl qt4 dbus zlib openssl readline perl;
@@ -5391,9 +5588,9 @@ let
     inherit fetchurl stdenv zlib;
   };
 
-  xapianBindings = (import ../development/libraries/xapian/bindings/1.0.14.nix) {
-    inherit fetchurl stdenv xapian composableDerivation pkgconfig;
-    inherit ruby perl php tcl python; # TODO perl php Java, tcl, C#, python
+  xapianBindings = (import ../development/libraries/xapian/bindings) {
+    inherit fetchurl xapian composableDerivation pkgconfig;
+    inherit ruby php python; # TODO perl php Java, tcl, C#, python
   };
 
   Xaw3d = import ../development/libraries/Xaw3d {
@@ -5579,6 +5776,7 @@ let
 
   perlcritic = perlPackages.PerlCritic;
 
+
   ### DEVELOPMENT / PYTHON MODULES
 
   buildPythonPackage =
@@ -5719,9 +5917,14 @@ let
 
   ### SERVERS
 
+  rdf4store = import ../servers/http/4store {
+    inherit builderDefsPackage librdf_raptor librdf_rasqal libxml2
+      pcre avahi readline ncurses expat zlib pkgconfig which perl;
+    inherit (gtkLibs) glib;
+  };
 
   apacheHttpd = makeOverridable (import ../servers/http/apache-httpd) {
-    inherit (pkgsOverriden) fetchurl stdenv perl openssl zlib apr aprutil pcre;
+    inherit fetchurl stdenv perl openssl zlib apr aprutil pcre;
     sslSupport = true;
   };
 
@@ -5734,7 +5937,8 @@ let
   };
 
   dico = import ../servers/dico {
-    inherit fetchurl stdenv libtool gettext zlib readline guile python;
+    inherit fetchurl stdenv libtool gettext zlib readline guile python
+      gsasl;
   };
 
   dict = makeOverridable (import ../servers/dict) {
@@ -5757,7 +5961,8 @@ let
   };
 
   ejabberd = import ../servers/xmpp/ejabberd {
-    inherit fetchurl stdenv expat erlang zlib openssl pam lib;
+    inherit fetchurl stdenv expat zlib openssl pam lib;
+    erlang = erlangR13B ;
   };
 
   couchdb = import ../servers/http/couchdb {
@@ -5806,7 +6011,7 @@ let
   };
 
   mod_python = makeOverridable (import ../servers/http/apache-modules/mod_python) {
-    inherit (pkgsOverriden) fetchurl stdenv apacheHttpd python;
+    inherit fetchurl stdenv apacheHttpd python;
   };
 
   mpd = import ../servers/mpd {
@@ -5829,8 +6034,8 @@ let
 
   pulseaudio = makeOverridable (import ../servers/pulseaudio) {
     inherit fetchurl stdenv pkgconfig gnum4 gdbm
-      dbus hal avahi liboil libsamplerate libsndfile speex
-      intltool gettext libtool libcap;
+      dbus avahi liboil libsamplerate libsndfile speex
+      intltool gettext libtool libcap bluez udev;
     inherit (xlibs) libX11 libICE libSM libXtst libXi;
     inherit (gtkLibs) gtk glib;
     inherit alsaLib;    # Needs ALSA >= 1.0.17.
@@ -5846,8 +6051,8 @@ let
   };
 
   monetdb = import ../servers/sql/monetdb {
-    inherit composableDerivation getConfig;
-    inherit fetchurl stdenv pcre openssl readline libxml2 geos apacheAnt jdk5;
+    inherit composableDerivation;
+    inherit fetchurl pcre openssl readline libxml2 geos apacheAnt jdk5;
   };
 
   mysql4 = import ../servers/sql/mysql {
@@ -5880,8 +6085,8 @@ let
     inherit fetchurl stdenv openssh;
   };
 
-  openfire = composedArgsAndFun (import ../servers/xmpp/openfire) {
-    inherit builderDefs jre;
+  openfire = makeOverridable (import ../servers/xmpp/openfire) {
+    inherit stdenv fetchurl builderDefs jre;
   };
 
   postgresql = postgresql83;
@@ -5910,6 +6115,10 @@ let
     inherit fetchurl stdenv m4 groff readline;
   };
 
+  redstore = import ../servers/http/redstore {
+    inherit builderDefsPackage redland pkgconfig gmp;
+  };
+
   samba = makeOverridable (import ../servers/samba) {
     inherit stdenv fetchurl readline openldap pam kerberos popt iniparser
       libunwind acl fam;
@@ -5956,7 +6165,7 @@ let
     inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa
       xkeyboard_config dbus hal libuuid openssl gperf m4
-      automake autoconf libtool xmlto asciidoc;
+      automake autoconf libtool xmlto asciidoc udev;
 
     # !!! pythonBase is use instead of python because this cause an infinite
     # !!! recursion when the flag python.full is set to true.  Packages
@@ -5965,8 +6174,8 @@ let
     python =  pythonBase;
   });
 
-  xorgReplacements = composedArgsAndFun (import ../servers/x11/xorg/replacements.nix) {
-    inherit fetchurl stdenv automake autoconf libtool xorg composedArgsAndFun;
+  xorgReplacements = makeOverridable (import ../servers/x11/xorg/replacements.nix) {
+    inherit fetchurl stdenv automake autoconf libtool xorg makeOverridable;
   };
 
   xorgVideoUnichrome = import ../servers/x11/xorg/unichrome/default.nix {
@@ -5984,7 +6193,7 @@ let
   ### OS-SPECIFIC
 
   afuse = import ../os-specific/linux/afuse {
-    inherit fetchurl stdenv lib pkgconfig fuse;
+    inherit fetchurl stdenv pkgconfig fuse;
   };
 
   autofs5 = import ../os-specific/linux/autofs/autofs-v5.nix {
@@ -6138,7 +6347,7 @@ let
   };
 
   halevt = import ../os-specific/linux/hal/hal-evt.nix {
-    inherit fetchurl stdenv lib libxml2 pkgconfig boolstuff hal dbus_glib;
+    inherit fetchurl stdenv libxml2 pkgconfig boolstuff hal dbus_glib;
   };
 
   hal_info = import ../os-specific/linux/hal/info.nix {
@@ -6192,6 +6401,8 @@ let
     inherit fetchgit stdenv autoconf libtool texinfo mig machHeaders;
     automake = automake111x;
     headersOnly = true;
+    gccCross = null;
+    glibcCross = null;
   };
 
   hurdLibpthreadCross = forceBuildDrv(import ../os-specific/gnu/libpthread {
@@ -6253,6 +6464,10 @@ let
     inherit fetchurl stdenv bison flex autoconf automake;
   };
 
+  libcroup = import ../os-specific/linux/libcg {
+    inherit stdenv fetchurl pam yacc flex;
+  };
+
   linuxHeaders = linuxHeaders_2_6_32;
 
   linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
@@ -6333,6 +6548,9 @@ let
       [ kernelPatches.fbcondecor_2_6_31
         kernelPatches.sec_perm_2_6_24
         kernelPatches.aufs2_2_6_32
+        kernelPatches.cifs_timeout
+        kernelPatches.no_xsave
+        kernelPatches.dell_rfkill
       ];
   };
 
@@ -6403,11 +6621,11 @@ let
      for a specific kernel.  This function can then be called for
      whatever kernel you're using. */
 
-  linuxPackagesFor = kernel: rec {
+  linuxPackagesFor = kernel: self: let callPackage = newScope self; in rec {
 
     inherit kernel;
 
-    ati_drivers_x11  = import ../os-specific/linux/ati-drivers {
+    ati_drivers_x11 = import ../os-specific/linux/ati-drivers {
       inherit stdenv fetchurl kernel xlibs which mesa xorg makeWrapper
         patchelf glibc;
       inherit (xorg) imake libXxf86vm xf86vidmodeproto;
@@ -6424,9 +6642,10 @@ let
     aufs2_util = import ../os-specific/linux/aufs2-util {
       inherit fetchurl stdenv kernel aufs2;
     };
-
+    
     blcr = import ../os-specific/linux/blcr/0.8.2.nix {
-      inherit fetchurl stdenv kernel perl makeWrapper;
+      inherit fetchurl stdenv kernel perl makeWrapper autoconf automake;
+      libtool = libtool_1_5; # libtool 2 causes a fork bomb
     };
 
     exmap = import ../os-specific/linux/exmap {
@@ -6444,8 +6663,8 @@ let
        then iwlwifi4965ucodeV2
        else iwlwifi4965ucodeV1);
 
-    atheros = composedArgsAndFun (import ../os-specific/linux/atheros/0.9.4.nix) {
-      inherit fetchurl stdenv builderDefs kernel lib;
+    atheros = makeOverridable (import ../os-specific/linux/atheros/0.9.4.nix) {
+      inherit fetchurl stdenv builderDefs kernel;
     };
 
     nvidia_x11 = makeOverridable (import ../os-specific/linux/nvidia-x11) {
@@ -6532,24 +6751,20 @@ let
   };
 
   # Build the kernel modules for the some of the kernels.
-  linuxPackages_2_6_25 = recurseIntoAttrs (linuxPackagesFor linux_2_6_25);
-  linuxPackages_2_6_27 = recurseIntoAttrs (linuxPackagesFor linux_2_6_27);
-  linuxPackages_2_6_28 = recurseIntoAttrs (linuxPackagesFor linux_2_6_28);
-  linuxPackages_2_6_29 = recurseIntoAttrs (linuxPackagesFor linux_2_6_29);
-  linuxPackages_2_6_31 = recurseIntoAttrs (linuxPackagesFor linux_2_6_31);
-  linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32);
+  linuxPackages_2_6_25 = recurseIntoAttrs (linuxPackagesFor linux_2_6_25 pkgs.linuxPackages_2_6_25);
+  linuxPackages_2_6_27 = recurseIntoAttrs (linuxPackagesFor linux_2_6_27 pkgs.linuxPackages_2_6_27);
+  linuxPackages_2_6_28 = recurseIntoAttrs (linuxPackagesFor linux_2_6_28 pkgs.linuxPackages_2_6_28);
+  linuxPackages_2_6_29 = recurseIntoAttrs (linuxPackagesFor linux_2_6_29 pkgs.linuxPackages_2_6_29);
+  linuxPackages_2_6_31 = recurseIntoAttrs (linuxPackagesFor linux_2_6_31 pkgs.linuxPackages_2_6_31);
+  linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 pkgs.linuxPackages_2_6_32);
   linuxPackages_2_6_32_systemtap =
-    recurseIntoAttrs (linuxPackagesFor linux_2_6_32_systemtap);
-  linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33);
-  linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34);
+    recurseIntoAttrs (linuxPackagesFor linux_2_6_32_systemtap pkgs.linuxPackages_2_6_32_systemtap);
+  linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33 pkgs.linuxPackages_2_6_33);
+  linuxPackages_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_2_6_34 pkgs.linuxPackages_2_6_34);
 
   # The current default kernel / kernel modules.
   linux = linux_2_6_32;
-  linuxPackages = linuxPackagesFor linux;
-
-  customKernel = composedArgsAndFun (lib.sumTwoArgs (import ../os-specific/linux/kernel/generic.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools;
-  });
+  linuxPackages = linuxPackages_2_6_32;
 
   keyutils = import ../os-specific/linux/keyutils {
     inherit fetchurl stdenv;
@@ -6582,6 +6797,10 @@ let
     inherit fetchurl stdenv bison flex perl;
   };
 
+  lsiutil = import ../os-specific/linux/lsiutil {
+    inherit fetchurl stdenv unzip;
+  };
+
   klibc = makeOverridable (import ../os-specific/linux/klibc) {
     inherit fetchurl stdenv perl bison mktemp linuxHeadersCross;
     linuxHeaders = glibc.kernelHeaders;
@@ -6591,22 +6810,7 @@ let
     inherit stdenv klibc;
   };
 
-  kvm = kvm76;
-
-  kvm76 = import ../os-specific/linux/kvm/76.nix {
-    inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync;
-    linuxHeaders = glibc.kernelHeaders;
-  };
-
-  kvm86 = import ../os-specific/linux/kvm/86.nix {
-    inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils;
-    linuxHeaders = glibc.kernelHeaders;
-  };
-
-  kvm88 = import ../os-specific/linux/kvm/88.nix {
-    inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils;
-    linuxHeaders = glibc.kernelHeaders;
-  };
+  kvm = qemu_kvm;
 
   libcap = import ../os-specific/linux/libcap {
     inherit fetchurl stdenv attr;
@@ -6641,6 +6845,7 @@ let
     inherit fetchgit stdenv autoconf texinfo;
     automake = automake111x;
     headersOnly = true;
+    mig = null;
   };
 
   mdadm = import ../os-specific/linux/mdadm {
@@ -6723,7 +6928,7 @@ let
     inherit stdenv fetchurl makeWrapper useSetUID dbus libxml2 pam hal pkgconfig pmount python pythonDBus;
   };
 
-  pcmciaUtils = composedArgsAndFun (import ../os-specific/linux/pcmciautils) {
+  pcmciaUtils = makeOverridable (import ../os-specific/linux/pcmciautils) {
     inherit stdenv fetchurl udev yacc flex;
     inherit sysfsutils module_init_tools;
 
@@ -6765,6 +6970,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  rt2870fw = import ../os-specific/linux/firmware/rt2870 {
+    inherit fetchurl stdenv unzip;
+  };
+
   rt73fw = import ../os-specific/linux/firmware/rt73 {
     inherit fetchurl stdenv unzip;
   };
@@ -6774,7 +6983,7 @@ let
   };
 
   shadow = import ../os-specific/linux/shadow {
-    inherit fetchurl stdenv pam;
+    inherit fetchurl stdenv pam glibc;
   };
 
   splashutils = import ../os-specific/linux/splashutils/default.nix {
@@ -6873,10 +7082,6 @@ let
     inherit fetchurl stdenv pkgconfig dbus libnih;
   };
 
-  upstartJobControl = import ../os-specific/linux/upstart/jobcontrol.nix {
-    inherit stdenv;
-  };
-
   usbutils = import ../os-specific/linux/usbutils {
     inherit fetchurl stdenv pkgconfig libusb;
   };
@@ -6887,6 +7092,7 @@ let
 
   utillinuxng = makeOverridable (import ../os-specific/linux/util-linux-ng) {
     inherit fetchurl stdenv;
+    ncurses = null;
   };
 
   utillinuxngCurses = utillinuxng.override {
@@ -7000,8 +7206,8 @@ let
     inherit (xorg) mkfontdir mkfontscale;
   });
 
-  clearlyU = composedArgsAndFun (import ../data/fonts/clearlyU/1.9.nix) {
-    inherit builderDefs;
+  clearlyU = makeOverridable (import ../data/fonts/clearlyU) {
+    inherit fetchurl stdenv;
     inherit (xorg) mkfontdir mkfontscale;
   };
 
@@ -7046,9 +7252,8 @@ let
     inherit fetchurl stdenv;
   };
 
-  junicode = composedArgsAndFun (import ../data/fonts/junicode/0.6.15.nix) {
-    inherit builderDefs fontforge unzip;
-    inherit (xorg) mkfontdir mkfontscale;
+  junicode = makeOverridable (import ../data/fonts/junicode) {
+    inherit fetchurl stdenv unzip;
   };
 
   freefont_ttf = import ../data/fonts/freefont-ttf {
@@ -7081,9 +7286,9 @@ let
     inherit fetchurl stdenv unzip;
   };
 
-  pthreadmanpages = lowPrio (import ../data/documentation/pthread-man-pages {
+  pthreadmanpages = import ../data/documentation/pthread-man-pages {
     inherit fetchurl stdenv perl;
-  });
+  };
 
   shared_mime_info = import ../data/misc/shared-mime-info {
     inherit fetchurl stdenv pkgconfig gettext
@@ -7136,7 +7341,7 @@ let
   };
 
   unifont = import ../data/fonts/unifont {
-    inherit debPackage perl;
+    inherit fetchurl stdenv;
     inherit (xorg) mkfontdir mkfontscale bdftopcf fontutil;
   };
 
@@ -7144,8 +7349,8 @@ let
     inherit fetchurl stdenv cabextract;
   };
 
-  wqy_zenhei = composedArgsAndFun (import ../data/fonts/wqy_zenhei/0.4.23-1.nix) {
-    inherit builderDefs;
+  wqy_zenhei = makeOverridable (import ../data/fonts/wqy-zenhei) {
+    inherit fetchurl stdenv;
   };
 
   xhtml1 = import ../data/sgml+xml/schemas/xml-dtd/xhtml1 {
@@ -7209,7 +7414,7 @@ let
   };
 
   ardour = import ../applications/audio/ardour {
-    inherit fetchurl stdenv lib pkgconfig scons boost redland librdf_raptor
+    inherit fetchurl stdenv pkgconfig scons boost librdf_raptor
       librdf_rasqal jackaudio flac libsamplerate alsaLib libxml2 libxslt
       libsndfile libsigcxx libusb cairomm librdf liblo fftw fftwSinglePrec
       aubio libmad;
@@ -7258,6 +7463,12 @@ let
     cairo = cairo.override { xcbSupport = true; };
   };
 
+  bangarang = import ../applications/video/bangarang {
+    inherit stdenv fetchurl cmake;
+    inherit (kde4) qt4 kdelibs automoc4 phonon soprano kdemultimedia;
+    inherit taglib glibc gettext;
+  };
+
   batik = import ../applications/graphics/batik {
     inherit fetchurl stdenv unzip;
   };
@@ -7272,11 +7483,10 @@ let
   };
 
   beast = import ../applications/audio/beast {
-# stdenv = overrideGCC stdenv gcc34;
-    inherit stdenv fetchurl zlib guile pkgconfig intltool libogg libvorbis python libxml2 bash perl gettext;
+    # stdenv = overrideGCC stdenv gcc34;
+    inherit stdenv fetchurl zlib guile pkgconfig intltool libogg libvorbis perl gettext;
     inherit (gtkLibs) gtk glib;
     inherit (gnome) libgnomecanvas libart_lgpl;
-    inherit automake autoconf;
   };
 
   bitlbee = import ../applications/networking/instant-messengers/bitlbee {
@@ -7373,7 +7583,7 @@ let
     };
 
   chrome = import ../applications/networking/browsers/chromium {
-    inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng dbus dbus_glib;
+    inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng dbus dbus_glib cups libgcrypt;
     inherit (xlibs) libX11 libXext libXrender libXt libXScrnSaver;
     inherit (gtkLibs) gtk glib pango atk;
     inherit (gnome) GConf;
@@ -7384,13 +7594,12 @@ let
   chromeWrapper = wrapFirefox chrome "chrome" "";
 
   cinelerra = import ../applications/video/cinelerra {
-    inherit lib fetchurl sourceFromHead stdenv
+    inherit fetchurl sourceFromHead stdenv
       automake autoconf libtool
       a52dec alsaLib   lame libavc1394 libiec61883 libraw1394 libsndfile
       libvorbis libogg libjpeg libtiff freetype mjpegtools x264
       gettext faad2 faac libtheora libpng libdv perl nasm e2fsprogs
-      pkgconfig;
-      openexr = openexr_1_6_1;
+      pkgconfig openexr;
     fftw = fftwSinglePrec;
     inherit (xorg) libXxf86vm libXv libXi libX11 xextproto;
     inherit (gnome) esound;
@@ -7448,11 +7657,10 @@ let
   cinepaint = import ../applications/graphics/cinepaint {
     inherit stdenv fetchcvs cmake pkgconfig freetype fontconfig lcms flex libtiff
       libjpeg libpng libexif zlib perl mesa perlXMLParser python pygtk gettext
-      intltool babl gegl automake autoconf libtool;
+      intltool babl gegl automake autoconf libtool openexr;
     inherit (xlibs) makedepend libX11 xf86vidmodeproto xineramaproto libXmu
       libXext libXpm libXxf86vm;
     inherit (gtkLibs) gtk glib;
-    openexr = openexr_1_6_1;
     fltk = fltk11;
   };
 
@@ -7495,7 +7703,7 @@ let
     inherit (gtkLibs) gtk glib;
   };
 
-  darcs = haskellPackages_ghc6104.darcs;
+  darcs = haskellPackages.darcs;
 
   dia = import ../applications/graphics/dia {
     inherit stdenv fetchurl pkgconfig perl perlXMLParser
@@ -7662,6 +7870,12 @@ let
       inherit fetchurl stdenv;
     };
 
+    # This is usually a newer version of Org-Mode than that found in GNU Emacs, so
+    # we want it to have higher precedence.
+    org = hiPrio (import ../applications/editors/emacs-modes/org {
+      inherit fetchurl stdenv emacs texinfo;
+    });
+
     prologMode = import ../applications/editors/emacs-modes/prolog {
       inherit fetchurl stdenv;
     };
@@ -7678,6 +7892,10 @@ let
       inherit fetchurl stdenv texinfo emacs bbdb;
     };
 
+    rudel = import ../applications/editors/emacs-modes/rudel {
+      inherit fetchurl stdenv;
+    };
+
     scalaMode = import ../applications/editors/emacs-modes/scala-mode {
       inherit fetchsvn stdenv emacs;
     };
@@ -7700,12 +7918,11 @@ let
   };
 
   exrdisplay = import ../applications/graphics/exrdisplay {
-    inherit fetchurl stdenv pkgconfig mesa which openexr_ctl;
+    inherit fetchurl stdenv pkgconfig mesa which openexr_ctl openexr;
     fltk = fltk20;
-    openexr = openexr_1_6_1;
   };
 
-  fbpanel = composedArgsAndFun (import ../applications/window-managers/fbpanel/4.12.nix) {
+  fbpanel = makeOverridable (import ../applications/window-managers/fbpanel) {
     inherit fetchurl stdenv builderDefs pkgconfig libpng libjpeg libtiff librsvg;
     inherit (gtkLibs) gtk;
     inherit (xlibs) libX11 libXmu libXpm;
@@ -7734,7 +7951,7 @@ let
   };
 
   grip = import ../applications/misc/grip {
-    inherit fetchurl stdenv lib grip pkgconfig curl cdparanoia libid3tag;
+    inherit fetchurl stdenv pkgconfig curl cdparanoia libid3tag;
     inherit (gtkLibs) gtk glib;
     inherit (gnome) libgnome libgnomeui vte;
   };
@@ -7767,9 +7984,8 @@ let
     inherit (xlibs) libXinerama;
   };
 
-  firefox = firefox35;
-
-  firefoxWrapper = firefox35Wrapper;
+  firefox = firefox36Pkgs.firefox;
+  firefoxWrapper = firefox36Wrapper;
 
   firefox35Pkgs = import ../applications/networking/browsers/firefox/3.5.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
@@ -7779,9 +7995,7 @@ let
     inherit (gnome) libIDL;
   };
 
-  firefox35 = firefox35Pkgs.firefox;
-  xulrunner35 = firefox35Pkgs.xulrunner;
-  firefox35Wrapper = wrapFirefox firefox35 "firefox" "";
+  firefox35Wrapper = wrapFirefox firefox35Pkgs.firefox "firefox" "";
 
   firefox36Pkgs = import ../applications/networking/browsers/firefox/3.6.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
@@ -7791,7 +8005,7 @@ let
     inherit (gnome) libIDL;
   };
 
-  firefox36Wrapper = lowPrio (wrapFirefox firefox36Pkgs.firefox "firefox" "");
+  firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
 
   flac = import ../applications/audio/flac {
     inherit fetchurl stdenv libogg;
@@ -7908,8 +8122,8 @@ let
     gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true;
   };
 
-  gocr = composedArgsAndFun (import ../applications/graphics/gocr/0.44.nix) {
-    inherit builderDefs fetchurl stdenv;
+  gocr = makeOverridable (import ../applications/graphics/gocr) {
+    inherit fetchurl stdenv;
   };
 
   gphoto2 = import ../applications/misc/gphoto2 {
@@ -7950,12 +8164,12 @@ let
   gecko_mediaplayer = import ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer {
     inherit fetchurl stdenv pkgconfig dbus dbus_glib x11 gnome_mplayer MPlayer glib;
     inherit (gnome) GConf;
-    browser = firefox35;
+    browser = firefox;
   };
 
   geeqie = import ../applications/graphics/geeqie {
     inherit fetchurl stdenv pkgconfig libpng lcms exiv2
-      intltool gettext;
+      intltool gettext libchamplain;
     inherit (gtkLibs) gtk;
   };
 
@@ -8013,32 +8227,34 @@ let
   };
 
   hugin = import ../applications/graphics/hugin {
-    inherit fetchurl stdenv cmake panotools libtiff libpng boost pkgconfig
+    inherit fetchurl cmake panotools libtiff libpng boost pkgconfig
       exiv2 gettext ilmbase enblendenfuse autopanosiftc mesa freeglut
-      glew;
+      glew openexr;
     inherit wxGTK;
     inherit (xlibs) libXi libXmu;
-    openexr = openexr_1_6_1;
+    stdenv = stdenv2;
   };
 
-  i810switch = import ../applications/misc/i810 {
+  i810switch = import ../os-specific/linux/i810switch {
     inherit fetchurl stdenv pciutils;
   };
 
   icecat3 = lowPrio (import ../applications/networking/browsers/icecat-3 {
-    inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
+    inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
       python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
       wirelesstools;
     inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
+    inherit (xlibs) pixman;
     inherit (pythonPackages) ply;
   });
 
   icecatXulrunner3 = lowPrio (import ../applications/networking/browsers/icecat-3 {
     application = "xulrunner";
-    inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
+    inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
       python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
       wirelesstools;
     inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
+    inherit (xlibs) pixman;
     inherit (pythonPackages) ply;
   });
 
@@ -8058,8 +8274,9 @@ let
     inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber
       HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext
       RpcXML XMLSimple PerlMagick;
-    git = if getPkgConfig "ikiwiki" "git" true then git else null;
-    monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null;
+    gitSupport = getPkgConfig "ikiwiki" "git" false;
+    monotoneSupport = getPkgConfig "ikiwiki" "monotone" false;
+    inherit git monotone;
     extraUtils = [];
   };
 
@@ -8067,6 +8284,8 @@ let
     inherit stdenv fetchurl bzip2 freetype graphviz ghostscript
       libjpeg libpng libtiff libxml2 zlib libtool jasper;
     inherit (xlibs) libX11;
+    tetex = null;
+    librsvg = null;
   };
 
   imagemagickBig = import ../applications/graphics/ImageMagick {
@@ -8089,7 +8308,7 @@ let
   inkscape = import ../applications/graphics/inkscape {
     inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib popt
       libxml2 libxslt libpng boehmgc libsigcxx lcms boost gettext
-      cairomm python pyxml makeWrapper intltool gsl;
+      python pyxml makeWrapper intltool gsl;
     inherit (pythonPackages) lxml;
     inherit (gtkLibs) gtk glib glibmm gtkmm;
     inherit (xlibs) libXft;
@@ -8109,7 +8328,7 @@ let
   };
 
   jackmeter = import ../applications/audio/jackmeter {
-    inherit fetchurl stdenv lib jackaudio pkgconfig;
+    inherit fetchurl stdenv jackaudio pkgconfig;
   };
 
   jedit = import ../applications/editors/jedit {
@@ -8117,7 +8336,7 @@ let
   };
 
   jigdo = import ../applications/misc/jigdo {
-    inherit fetchurl stdenv db45 libwpd bzip2;
+    inherit fetchurl stdenv db45 bzip2;
     inherit (gtkLibs) gtk;
   };
 
@@ -8155,14 +8374,15 @@ let
   };
 
   ladspaH = import ../applications/audio/ladspa-plugins/ladspah.nix {
-    inherit fetchurl stdenv builderDefs stringsWithDeps;
+    inherit fetchurl stdenv builderDefs;
   };
 
   ladspaPlugins = import ../applications/audio/ladspa-plugins {
-    inherit fetchurl stdenv builderDefs stringsWithDeps fftw ladspaH pkgconfig;
+    inherit fetchurl stdenv ladspaH pkgconfig;
+    fftw = fftwSinglePrec;
   };
 
-  ldcpp = composedArgsAndFun (import ../applications/networking/p2p/ldcpp/1.0.3.nix) {
+  ldcpp = makeOverridable (import ../applications/networking/p2p/ldcpp) {
     inherit builderDefs scons pkgconfig bzip2 openssl;
     inherit (gtkLibs) gtk;
     inherit (gnome) libglade;
@@ -8200,7 +8420,7 @@ let
   };
 
   mercurial = import ../applications/version-management/mercurial {
-    inherit fetchurl stdenv makeWrapper getConfig tk;
+    inherit fetchurl stdenv makeWrapper tk;
     guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg)
     python = # allow cloning sources from https servers.
       if getConfig ["mercurial" "httpsSupport"] true
@@ -8222,7 +8442,8 @@ let
     inherit imagemagick intltool python pkgconfig webkit libxml2
       which gettext makeWrapper file libidn sqlite docutils libnotify;
     inherit (gtkLibs) gtk glib;
-    inherit (gnome28) gtksourceview libsoup;
+    inherit (gnome28) gtksourceview;
+    inherit (webkit.passthru.args) libsoup;
   };
 
   minicom = import ../tools/misc/minicom {
@@ -8302,9 +8523,8 @@ let
     };
 
   mrxvt = import ../applications/misc/mrxvt {
-    inherit lib fetchurl stdenv freetype pkgconfig which;
-    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXft
-      libXi inputproto;
+    inherit fetchurl stdenv freetype pkgconfig which;
+    inherit (xlibs) libX11 libSM libICE libXft libXi inputproto;
   };
 
   multisync = import ../applications/misc/multisync {
@@ -8355,7 +8575,7 @@ let
     inherit (gtkLibs) gtk;
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2;
-    neon = neon026;
+    neon = neon029;
   };
 
   go_oo = import ../applications/office/openoffice/go-oo.nix {
@@ -8367,7 +8587,7 @@ let
     inherit (gtkLibs) gtk;
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2;
-    neon = neon026;
+    neon = neon029;
 
     inherit autoconf openldap postgresql;
   };
@@ -8379,8 +8599,9 @@ let
   };
 
   pan = import ../applications/networking/newsreaders/pan {
-    inherit fetchurl stdenv pkgconfig perl pcre gmime gettext;
+    inherit fetchurl stdenv pkgconfig perl pcre gettext;
     inherit (gtkLibs) gtk;
+    gmime = gmime_2_2;
     spellChecking = false;
   };
 
@@ -8400,7 +8621,7 @@ let
   };
 
   partitionManager = import ../tools/misc/partition-manager {
-    inherit fetchurl stdenv lib cmake pkgconfig gettext parted libuuid perl;
+    inherit fetchurl stdenv cmake gettext parted libuuid perl;
     kde = kde44;
     qt = qt4;
   };
@@ -8421,7 +8642,7 @@ let
     inherit (gst_all) gstPluginsBase;
   };
 
-  pidginlatex = composedArgsAndFun (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex) {
+  pidginlatex = makeOverridable (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex) {
     inherit fetchurl stdenv pkgconfig ghostscript pidgin texLive;
     imagemagick = imagemagickBig;
     inherit (gtkLibs) glib gtk;
@@ -8446,6 +8667,11 @@ let
     inherit fetchurl stdenv ncurses readline;
   };
 
+  pinta = import ../applications/graphics/pinta {
+    inherit fetchgit stdenv mono pkgconfig;
+    gtksharp = gtksharp2;
+  };
+
   pqiv = import ../applications/graphics/pqiv {
     inherit fetchurl stdenv getopt which pkgconfig;
     inherit (gtkLibs) gtk;
@@ -8454,7 +8680,7 @@ let
   # perhaps there are better apps for this task? It's how I had configured my preivous system.
   # And I don't want to rewrite all rules
   procmail = import ../applications/misc/procmail {
-    inherit fetchurl stdenv autoconf;
+    inherit fetchurl stdenv;
   };
 
   pstree = import ../applications/misc/pstree {
@@ -8473,13 +8699,12 @@ let
     inherit fetchsvn SDL zlib which stdenv;
   };
 
-  qemuImage = composedArgsAndFun (import ../applications/virtualization/qemu/linux-img/0.2.nix) {
-    inherit builderDefs fetchurl stdenv;
+  qemuImage = makeOverridable (import ../applications/virtualization/qemu/linux-img) {
+    inherit fetchurl stdenv;
   };
 
   qtpfsgui = import ../applications/graphics/qtpfsgui {
-    inherit fetchurl stdenv exiv2 libtiff fftw qt4 ilmbase;
-    openexr = openexr_1_6_1;
+    inherit fetchurl stdenv exiv2 libtiff fftw qt4 ilmbase openexr;
   };
 
   rapidsvn = import ../applications/version-management/rapidsvn {
@@ -8508,33 +8733,33 @@ let
   };
 
   RealPlayer =
-    (import ../applications/video/RealPlayer {
+    import ../applications/video/RealPlayer {
       inherit fetchurl stdenv;
       inherit (gtkLibs) glib pango atk gtk;
       inherit (xlibs) libX11;
       libstdcpp5 = gcc33.gcc;
-    });
+    };
 
   rekonq = makeOverridable (import ../applications/networking/browsers/rekonq) {
-    inherit fetchurl fetchgit stdenv cmake perl;
+    inherit fetchurl stdenv cmake perl gettext;
+    inherit (gtkLibs) gtk;
+    inherit (xlibs) pixman;
     inherit (kde4) qt4 kdelibs automoc4 phonon;
   };
 
-  rekonqScm = rekonq.override { v = "scm"; };
-
   rsync = import ../applications/networking/sync/rsync {
     inherit fetchurl stdenv acl perl;
     enableACLs = !stdenv.isDarwin;
   };
 
   rxvt = import ../applications/misc/rxvt {
-    inherit lib fetchurl stdenv;
+    inherit fetchurl stdenv;
     inherit (xlibs) libXt libX11;
   };
 
   # = urxvt
   rxvt_unicode = makeOverridable (import ../applications/misc/rxvt_unicode) {
-    inherit lib fetchurl stdenv perl ncurses;
+    inherit fetchurl stdenv perl ncurses;
     inherit (xlibs) libXt libX11 libXft;
     perlSupport = false;
   };
@@ -8551,14 +8776,17 @@ let
   };
 
   scribus = import ../applications/office/scribus {
-    inherit fetchurl stdenv lib cmake pkgconfig freetype lcms libtiff libxml2
-      cairo python cups fontconfig zlib libjpeg libpng;
+    inherit fetchurl stdenv cmake pkgconfig freetype lcms libtiff libxml2
+      cairo python cups fontconfig zlib libjpeg libpng xorg;
     inherit (gnome) libart_lgpl;
-    inherit (xlibs) libXau libXaw libXdmcp libXext libX11 libXtst libXi libXinerama libXrender;
-    inherit (xorg) pixman libpthreadstubs;
     qt = qt3;
   };
 
+  seeks = import ../tools/networking/p2p/seeks {
+    inherit fetchurl stdenv zlib docbook2x pcre curl libxml2 libevent perl
+      autoconf automake libtool;
+  };
+
   seg3d = import ../applications/graphics/seg3d {
     inherit fetchurl stdenv cmake itk mesa zlib libuuid;
     inherit (xlibs) libXft libXext libXi libXmu;
@@ -8571,6 +8799,11 @@ let
     inherit fetchurl stdenv cmake ruby;
   };
 
+  semnotes = import ../applications/misc/semnotes {
+    inherit stdenv fetchurl cmake;
+    inherit (kde4) qt4 kdelibs automoc4 phonon soprano;
+  };
+
   skype_linux = import ../applications/networking/skype {
     inherit fetchurl stdenv;
     inherit alsaLib freetype fontconfig zlib;
@@ -8597,7 +8830,7 @@ let
   };
 
   sonicVisualizer = import ../applications/audio/sonic-visualizer {
-    inherit fetchurl stdenv lib libsndfile libsamplerate bzip2 librdf
+    inherit fetchurl stdenv libsndfile libsamplerate bzip2 librdf
       rubberband jackaudio pulseaudio libmad
       libogg liblo alsaLib librdf_raptor librdf_rasqal redland fftw;
     inherit (vamp) vampSDK;
@@ -8605,14 +8838,9 @@ let
   };
 
   sox = import ../applications/misc/audio/sox {
-    inherit fetchurl stdenv lib composableDerivation;
-    # optional features
-    inherit alsaLib libao ffmpeg;
-    inherit libsndfile libogg flac libmad lame libsamplerate;
-    # Using the default nix ffmpeg I get this error when linking
-    # .libs/libsox_la-ffmpeg.o: In function `audio_decode_frame':
-    # /tmp/nix-7957-1/sox-14.0.0/src/ffmpeg.c:130: undefined reference to `avcodec_decode_audio2
-    # That's why I'v added ffmpeg_svn
+    inherit fetchurl lib composableDerivation;
+    inherit alsaLib libao;
+    inherit libmad lame;
   };
 
   stumpwm = builderDefsPackage (import ../applications/window-managers/stumpwm) {
@@ -8621,7 +8849,7 @@ let
   };
 
   subversion = makeOverridable (import ../applications/version-management/subversion/default.nix) {
-    inherit (pkgsOverriden) fetchurl stdenv apr aprutil expat swig zlib jdk python perl sqlite;
+    inherit fetchurl stdenv apr aprutil expat swig zlib jdk python perl sqlite;
     neon = neon029;
     bdbSupport = getConfig ["subversion" "bdbSupport"] true;
     httpServer = getConfig ["subversion" "httpServer"] false;
@@ -8631,7 +8859,7 @@ let
     perlBindings = getConfig ["subversion" "perlBindings"] false;
     javahlBindings = supportsJDK && getConfig ["subversion" "javahlBindings"] false;
     compressionSupport = getConfig ["subversion" "compressionSupport"] true;
-    httpd = pkgsOverriden.apacheHttpd;
+    httpd = apacheHttpd;
   };
 
   svk = perlPackages.SVK;
@@ -8650,10 +8878,11 @@ let
   };
 
   tahoelafs = import ../tools/networking/p2p/tahoe-lafs {
-    inherit fetchurl lib unzip nettools buildPythonPackage;
+    inherit fetchurl lib unzip nettools buildPythonPackage pycrypto;
     inherit (pythonPackages) twisted foolscap simplejson nevow zfec
       pycryptopp pysqlite darcsver setuptoolsTrial setuptoolsDarcs
-      numpy;
+      numpy pyasn1;
+    mock = pythonPackages.mock060;
   };
 
   tailor = builderDefsPackage (import ../applications/version-management/tailor) {
@@ -8689,7 +8918,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  thunderbird = thunderbird2;
+  thunderbird = thunderbird3;
 
   thunderbird2 = import ../applications/networking/mailreaders/thunderbird/2.x.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
@@ -8698,14 +8927,15 @@ let
     inherit (xlibs) libXi;
   };
 
-  thunderbird3 = lowPrio (import ../applications/networking/mailreaders/thunderbird/3.x.nix {
-    inherit fetchurl stdenv pkgconfig perl python dbus_glib zip bzip2 alsaLib nspr;
+  thunderbird3 = import ../applications/networking/mailreaders/thunderbird/3.x.nix {
+    inherit fetchurl stdenv pkgconfig perl python dbus_glib zip bzip2 alsaLib nspr libnotify cairo fontconfig;
+    inherit (xorg) pixman;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
-  });
+  };
 
   timidity = import ../tools/misc/timidity {
-    inherit fetchurl stdenv lib alsaLib composableDerivation jackaudio ncurses;
+    inherit fetchurl stdenv alsaLib composableDerivation jackaudio ncurses;
   };
 
   tkcvs = import ../applications/version-management/tkcvs {
@@ -8722,11 +8952,10 @@ let
   };
 
   twinkle = import ../applications/networking/twinkle {
-    inherit fetchurl stdenv lib pkgconfig commoncpp2 ccrtp openssl speex libjpeg perl
-      libzrtpcpp libsndfile libxml2 file readline alsaLib;
+    inherit fetchurl stdenv pkgconfig commoncpp2 ccrtp openssl speex libjpeg perl
+      libzrtpcpp libsndfile libxml2 file readline alsaLib xorg;
     qt = qt3;
     boost = boostFull;
-    inherit (xlibs) libX11 libXaw libICE libXext;
   };
 
   unison = import ../applications/networking/sync/unison {
@@ -8741,14 +8970,8 @@ let
   uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
     inherit pkgconfig webkit makeWrapper;
     inherit (gtkLibs) gtk glib;
-    libsoup = gnome28.libsoup;
-  };
-
-  uzblExperimental = builderDefsPackage
-        (import ../applications/networking/browsers/uzbl/experimental.nix) {
-    inherit pkgconfig webkit makeWrapper;
-    inherit (gtkLibs) gtk glib;
-    libsoup = gnome28.libsoup;
+    inherit (xlibs) libX11;
+    libsoup = gnome28.libsoup_2_31;
   };
 
   valknut = import ../applications/networking/p2p/valknut {
@@ -8763,20 +8986,10 @@ let
   };
 
   vim = makeOverridable (import ../applications/editors/vim) {
-    inherit fetchurl stdenv ncurses lib;
+    inherit fetchurl stdenv ncurses;
   };
 
-  vimHugeX = vim.override {
-    inherit pkgconfig
-      perl python tcl;
-    inherit (xlibs) libX11 libXext libSM libXpm
-      libXt libXaw libXau;
-    inherit (gtkLibs) glib gtk;
-
-    # Looks like python and perl can conflict
-    flags = ["hugeFeatures" "gtkGUI" "x11Support"
-      /*"perlSupport"*/ "pythonSupport" "tclSupport"];
-  };
+  vimHugeX = vim_configurable;
 
   vim_configurable = import ../applications/editors/vim/configurable.nix {
     inherit fetchurl stdenv ncurses pkgconfig composableDerivation lib;
@@ -8793,12 +9006,18 @@ let
     flags = [ "X11" ]; # only flag "X11" by now
   };
 
+  virtualgl =  import ../tools/X11/virtualgl {
+    inherit stdenv fetchurl mesa openssl libjpeg_turbo;
+    inherit (xlibs) libX11 libXext;
+  };
+
   vlc = import ../applications/video/vlc {
     inherit fetchurl stdenv perl xlibs zlib a52dec libmad faad2
       ffmpeg libdvdnav pkgconfig hal fribidi qt4 freefont_ttf
-      libvorbis libtheora speex;
+      libvorbis libtheora speex libgcrypt libupnp;
     dbus = dbus.libs;
     alsa = alsaLib;
+    lua = lua5;
   };
 
   vnstat = import ../applications/networking/vnstat {
@@ -8819,6 +9038,10 @@ let
     graphicsSupport = false;
   };
 
+  wings = import ../applications/graphics/wings {
+    inherit stdenv fetchurl erlang esdl;
+  };
+
   # I'm keen on wmiimenu only  >wmii-3.5 no longer has it...
   wmiimenu = import ../applications/window-managers/wmii31 {
     libixp = libixp_for_wmii;
@@ -8853,17 +9076,12 @@ let
        );
   };
 
-  x11vnc = composedArgsAndFun (import ../tools/X11/x11vnc/0.9.3.nix) {
-    inherit builderDefs openssl zlib libjpeg ;
-    inherit (xlibs) libXfixes fixesproto libXdamage damageproto
-      libX11 xproto libXtst libXinerama xineramaproto libXrandr randrproto
-      libXext xextproto inputproto recordproto libXi renderproto
-      libXrender;
+  x11vnc = makeOverridable (import ../tools/X11/x11vnc) {
+    inherit stdenv fetchurl xorg openssl zlib libjpeg;
   };
 
-  x2vnc = composedArgsAndFun (import ../tools/X11/x2vnc/1.7.2.nix) {
-    inherit builderDefs;
-    inherit (xlibs) libX11 xproto xextproto libXext libXrandr randrproto;
+  x2vnc = makeOverridable (import ../tools/X11/x2vnc) {
+    inherit stdenv fetchurl xorg;
   };
 
   xaos = builderDefsPackage (import ../applications/graphics/xaos) {
@@ -8930,16 +9148,14 @@ let
 
   xneur = import ../applications/misc/xneur {
     inherit fetchurl stdenv pkgconfig pcre libxml2 aspell imlib2
-      xosd libnotify cairo;
+      xosd libnotify cairo xorg;
     GStreamer=gst_all.gstreamer;
-    inherit (xlibs) libX11 libXpm libXt libXext libXi;
     inherit (gtkLibs) glib gtk pango atk;
   };
 
   xneur_0_8 = import ../applications/misc/xneur/0.8.nix {
-    inherit fetchurl stdenv pkgconfig pcre libxml2 aspell imlib2 xosd glib;
+    inherit fetchurl stdenv pkgconfig pcre libxml2 aspell imlib2 xosd glib xorg;
     GStreamer = gst_all.gstreamer;
-    inherit (xlibs) libX11 libXpm libXt libXext;
   };
 
   xournal = import ../applications/graphics/xournal {
@@ -8965,15 +9181,15 @@ let
     pyrex = pyrex095;
   };
 
-  xscreensaver = makeOverridable (import ../applications/graphics/xscreensaver) {
-    inherit stdenv fetchurl pkgconfig bc perl xlibs libjpeg mesa libxml2;
+  xscreensaver =  (import ../applications/graphics/xscreensaver) {
+    inherit pkgconfig bc perl xlibs libjpeg mesa libxml2
+      builderDefsPackage;
     inherit (gtkLibs) gtk;
     inherit (gnome) libglade;
   };
 
   xterm = import ../applications/misc/xterm {
-    inherit fetchurl stdenv ncurses freetype pkgconfig;
-    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXext libXft luit;
+    inherit fetchurl stdenv ncurses freetype pkgconfig xorg;
   };
 
   xtrace = import ../tools/X11/xtrace {
@@ -9012,8 +9228,8 @@ let
   };
 
   yate = import ../applications/misc/yate {
-    inherit sox speex openssl automake autoconf pkgconfig;
-    inherit fetchurl stdenv lib composableDerivation;
+    inherit openssl automake autoconf pkgconfig;
+    inherit fetchurl lib composableDerivation;
     qt = qt4;
   };
 
@@ -9062,6 +9278,14 @@ let
     inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_ttf guile gettext;
   };
 
+  blackshades = import ../games/blackshades {
+    inherit fetchsvn stdenv libvorbis SDL mesa openal freealut SDL_image;
+  };
+
+  blackshadeselite = import ../games/blackshadeselite {
+    inherit fetchsvn stdenv libvorbis SDL mesa openal freealut SDL_image popt;
+  };
+
   bsdgames = import ../games/bsdgames {
     inherit fetchurl stdenv ncurses openssl flex bison miscfiles;
   };
@@ -9070,13 +9294,14 @@ let
     inherit fetchurl stdenv python pygame twisted lib numeric makeWrapper;
   };
 
-  construoBase = composedArgsAndFun (import ../games/construo/0.2.2.nix) {
-    inherit stdenv fetchurl builderDefs
-      zlib;
+  construoBase = makeOverridable (import ../games/construo) {
+    inherit stdenv fetchurl builderDefs zlib;
     inherit (xlibs) libX11 xproto;
+    mesa = null;
+    freeglut = null;
   };
 
-  construo = construoBase.passthru.function {
+  construo = construoBase.override {
     inherit mesa freeglut;
   };
 
@@ -9109,15 +9334,12 @@ let
     wxGTK = wxGTK28.override {unicode = false;};
   };
 
-  fsgAltBuild = import ../games/fsg/alt-builder.nix {
-    inherit stdenv fetchurl mesa;
-    wxGTK = wxGTK28.override {unicode = false;};
-    inherit (xlibs) libX11 xproto;
-    inherit stringsWithDeps builderDefs;
+  gemrb = import ../games/gemrb {
+    inherit fetchurl stdenv cmake SDL openal zlib libpng python libvorbis;
   };
 
-  gemrb = import ../games/gemrb {
-    inherit fetchurl stdenv SDL openal freealut zlib libpng python;
+  gltron = import ../games/gltron {
+    inherit fetchurl stdenv mesa SDL zlib libpng libmikmod libvorbis SDL_sound;
   };
 
   gnuchess = builderDefsPackage (import ../games/gnuchess) {
@@ -9149,9 +9371,9 @@ let
   };
 
   micropolis = import ../games/micropolis {
-    inherit lib fetchurl stdenv;
+    inherit fetchurl stdenv;
     inherit (xlibs) libX11 libXpm libXext xextproto;
-    inherit byacc bash;
+    inherit byacc;
   };
 
   openttd = import ../games/openttd {
@@ -9207,7 +9429,7 @@ let
   };
 
   # You still can override by passing more arguments.
-  spaceOrbit = composedArgsAndFun (import ../games/orbit/1.01.nix) {
+  spaceOrbit = makeOverridable (import ../games/orbit) {
     inherit fetchurl stdenv builderDefs mesa freeglut;
     inherit (gnome) esound;
     inherit (xlibs) libXt libX11 libXmu libXi libXext;
@@ -9236,6 +9458,11 @@ let
     python24 = python;
   };*/
 
+  tremulous = import ../games/tremulous {
+    inherit stdenv fetchurl unzip mesa SDL openal;
+    inherit (xlibs) libX11;
+  };
+
   ultimatestunts = import ../games/ultimatestunts {
     inherit stdenv fetchurl SDL mesa SDL_image freealut;
   };
@@ -9276,8 +9503,7 @@ let
   };
 
   zoom = import ../games/zoom {
-    inherit fetchurl stdenv perl expat freetype;
-    inherit (xlibs) xlibs;
+    inherit fetchurl stdenv perl expat freetype x11;
   };
 
   keen4 = import ../games/keen4 {
@@ -9345,7 +9571,7 @@ let
     };
 
     kphone = import ../applications/networking/kphone {
-      inherit fetchurl lib autoconf automake libtool pkgconfig openssl libpng alsaLib;
+      inherit fetchurl 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
@@ -9370,7 +9596,7 @@ let
   kde4 = kde44;
 
   kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // {
-    openexr = openexr_1_6_1;
+    qt4 = qt46;
     inherit stdenv;
   });
 
@@ -9401,15 +9627,14 @@ let
   };
 
   arb = import ../applications/science/biology/arb {
-    inherit fetchurl readline libpng zlib x11 lesstif93 freeglut perl;
-    inherit (xlibs) libXpm libXaw libX11 libXext libXt;
+    inherit fetchurl libpng freeglut perl xorg;
     inherit mesa glew libtiff lynx rxp sablotron jdk transfig gv gnuplot;
     lesstif = lesstif93;
     stdenv = overrideGCC stdenv gcc42;
   };
 
   biolib = import ../development/libraries/science/biology/biolib {
-    inherit fetchurl stdenv readline perl cmake rLang zlib;
+    inherit fetchurl stdenv cmake rLang zlib;
   };
 
   emboss = import ../applications/science/biology/emboss {
@@ -9507,7 +9732,8 @@ let
   ### SCIENCE / ELECTRONICS
 
   ngspice = import ../applications/science/electronics/ngspice {
-    inherit fetchurl stdenv readline;
+    inherit fetchurl stdenv readline bison;
+    inherit (xlibs) libX11 libICE libXaw libXext;
   };
 
   gtkwave = import ../applications/science/electronics/gtkwave {
@@ -9544,6 +9770,29 @@ let
     withX = true;
   };
 
+  ### SCIENCE / MISC
+
+  golly = import ../applications/science/misc/golly {
+    inherit builderDefsPackage wxGTK perl zlib
+      python;
+  };
+
+  simgrid = import ../applications/science/misc/simgrid {
+    inherit fetchurl cmake ruby;
+    stdenv = stdenv2;
+  };
+
+  tulip = import ../applications/science/misc/tulip {
+    inherit fetchurl stdenv libxml2 freetype mesa glew
+      autoconf automake libtool;
+    qt = qt4;
+  };
+
+  vite = import ../applications/science/misc/vite {
+    inherit fetchsvn cmake mesa;
+    qt = qt4;
+    stdenv = stdenv2;
+  };
 
   ### MISC
 
@@ -9569,8 +9818,8 @@ let
   };
 
   gutenprint = import ../misc/drivers/gutenprint {
-    inherit fetchurl stdenv lib pkgconfig composableDerivation cups libtiff libpng
-      openssl git gimp;
+    inherit fetchurl stdenv pkgconfig composableDerivation cups libtiff libpng
+      openssl gimp;
   };
 
   gutenprintBin = import ../misc/drivers/gutenprint/bin.nix {
@@ -9636,15 +9885,18 @@ let
   }));
 
   gxemul = (import ../misc/gxemul) {
-    inherit lib stdenv fetchurl composableDerivation;
-    inherit (xlibs) libX11;
+    inherit fetchurl composableDerivation;
+  };
+
+  hplip = import ../misc/drivers/hplip {
+    inherit stdenv fetchurl cups zlib libjpeg libusb python saneBackends dbus pkgconfig qt4;
+    qtSupport = true;
   };
 
   # using the new configuration style proposal which is unstable
   jackaudio = import ../misc/jackaudio {
     inherit composableDerivation
-           ncurses lib stdenv fetchurl alsaLib pkgconfig;
-    flags = [ "posix_shm" "timestamps" "alsa"];
+           fetchurl alsaLib pkgconfig;
   };
 
   keynav = import ../tools/X11/keynav {
@@ -9657,7 +9909,7 @@ let
   };
 
   lilypond = import ../misc/lilypond {
-    inherit fetchurl sourceFromHead stdenv lib automake autoconf
+    inherit fetchurl stdenv 
       ghostscript texinfo imagemagick texi2html guile python gettext
       perl bison pkgconfig texLive fontconfig freetype fontforge help2man;
     inherit (gtkLibs) pango;
diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix
index 7f41a664ab2..004b75254a0 100644
--- a/pkgs/top-level/guile-2-test.nix
+++ b/pkgs/top-level/guile-2-test.nix
@@ -54,7 +54,6 @@ in (mapTestOn {
    */
 
   guile = linux;
-  guile_1_9_coverage = linux;
 
   autogen = linux;
   lsh = linux;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 875a3cf5052..819f7ee1416 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -61,6 +61,10 @@ rec {
     inherit cabal;
   };
 
+  blazeHtml = import ../development/libraries/haskell/blaze-html {
+    inherit cabal text;
+  };
+
   bytestring = import ../development/libraries/haskell/bytestring {
     inherit cabal;
   };
@@ -69,15 +73,29 @@ rec {
     inherit cabal bytestring network;
   };
 
+  cairo = import ../development/libraries/haskell/cairo {
+    inherit cabal gtk2hsBuildtools mtl;
+    inherit (pkgs) pkgconfig glibc cairo zlib;
+  };
+
   cautiousFile = import ../development/libraries/haskell/cautious-file {
     inherit cabal;
   };
 
+  cereal = import ../development/libraries/haskell/cereal {
+    inherit cabal;
+  };
+
   cgi3001172 = import ../development/libraries/haskell/cgi/3001.1.7.2.nix {
     inherit cabal mtl parsec xhtml;
     network = network2217;
   };
 
+  cgi3001173 = import ../development/libraries/haskell/cgi/3001.1.7.3.nix {
+    inherit cabal mtl parsec xhtml;
+    network = network2217;
+  };
+
   cgi = import ../development/libraries/haskell/cgi {
     inherit cabal mtl network parsec xhtml;
   };
@@ -176,6 +194,10 @@ rec {
     inherit cabal mtl;
   };
 
+  fgl5423 = import ../development/libraries/haskell/fgl/5.4.2.3.nix {
+    inherit cabal mtl;
+  };
+
   gdiff = import ../development/libraries/haskell/gdiff {
     inherit cabal;
   };
@@ -189,6 +211,10 @@ rec {
     inherit cabal pcreLight colorizeHaskell;
   };
 
+  ghcMtl = import ../development/libraries/haskell/ghc-mtl {
+    inherit cabal mtl MonadCatchIOMtl;
+  };
+
   ghcPaths0106 = import ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {
     inherit cabal;
   };
@@ -238,6 +264,16 @@ rec {
     inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo;
   };
 
+  gtk2hsBuildtools = import ../development/libraries/haskell/gtk2hs-buildtools {
+    inherit cabal;
+    alex = alex233;
+    happy = happy1185;
+  };
+
+  hamlet = import ../development/libraries/haskell/hamlet {
+    inherit cabal blazeHtml parsec utf8String;
+  };
+
   HAppSData = import ../development/libraries/haskell/HAppS/HAppS-Data.nix {
     inherit cabal mtl sybWithClass HaXml HAppSUtil bytestring binary;
   };
@@ -292,6 +328,11 @@ rec {
     inherit cabal happy;
   };
 
+  haskellSrcP = import ../development/libraries/haskell/haskell-src {
+    inherit cabal;
+    happy = happy1185;
+  };
+
   haskellSrcExts = import ../development/libraries/haskell/haskell-src-exts {
     inherit cabal cpphs happy;
   };
@@ -300,17 +341,44 @@ rec {
     inherit cabal haskellSrcExts;
   };
 
+  haskellPlatform = haskellPlatform2010200;
+
+  haskellPlatform2010200 = import ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
+    inherit cabal ghc
+      html xhtml;
+    haskellSrc = haskellSrcP;
+    fgl = fgl5423;
+    cabalInstall = cabalInstall082;
+    GLUT = GLUT2121;
+    OpenGL = OpenGL2230;
+    zlib = zlib0520;
+    alex = alex233;
+    cgi = cgi3001173;
+    QuickCheck = QuickCheck2;
+    HTTP = HTTP400009;
+    HUnit = HUnit1221;
+    network = network2217;
+    parallel = parallel2201;
+    regexBase = regexBase0932;
+    regexCompat = regexCompat0931;
+    regexPosix = regexPosix0942;
+    stm = stm2121;
+    haddock = haddock272P;
+    happy = happy1185;
+    inherit (pkgs) fetchurl;
+  };
+
   haskellPlatform2010100 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
     inherit cabal ghc fgl
       haskellSrc html
-      stm xhtml happy;
+      stm xhtml;
     cabalInstall = cabalInstall080;
     GLUT = GLUT2121;
     OpenGL = OpenGL2230;
     zlib = zlib0520;
     alex = alex232;
     cgi = cgi3001172;
-    QuickCheck = QuickCheck2;
+    QuickCheck = QuickCheck2103;
     HTTP = HTTP400009;
     HUnit = HUnit1221;
     network = network2217;
@@ -319,10 +387,11 @@ rec {
     regexCompat = regexCompat092;
     regexPosix = regexPosix0941;
     haddock = haddock272;
+    happy = happy1184;
     inherit (pkgs) fetchurl;
   });
 
-  haskellPlatform = import ../development/libraries/haskell/haskell-platform {
+  haskellPlatform2009202 = import ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix {
     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;
@@ -376,6 +445,12 @@ rec {
     inherit cabal parsec pcreLight xhtml;
   };
 
+  hint = import ../development/libraries/haskell/hint {
+    inherit cabal extensibleExceptions filepath ghcMtl haskellSrc
+      MonadCatchIOMtl mtl utf8String;
+    ghcPaths = ghcPaths0106;
+  };
+
   Hipmunk = import ../development/libraries/haskell/Hipmunk {
     inherit cabal;
   };
@@ -462,6 +537,14 @@ rec {
     inherit cabal;
   };
 
+  MonadCatchIOMtl = import ../development/libraries/haskell/MonadCatchIO-mtl {
+    inherit cabal mtl extensibleExceptions;
+  };
+
+  MonadCatchIOTransformers = import ../development/libraries/haskell/MonadCatchIO-transformers {
+    inherit cabal transformers extensibleExceptions;
+  };
+
   monadlab = import ../development/libraries/haskell/monadlab {
     inherit cabal parsec;
   };
@@ -559,6 +642,11 @@ rec {
     inherit (pkgs) pcre;
   };
 
+  persistent = import ../development/libraries/haskell/persistent {
+    inherit cabal blazeHtml MonadCatchIOTransformers parsec text
+      transformers utf8String webRoutesQuasi;
+  };
+
   polyparse = import ../development/libraries/haskell/polyparse {
     inherit cabal;
   };
@@ -581,6 +669,10 @@ rec {
     inherit cabal;
   };
 
+  QuickCheck2103 = import ../development/libraries/haskell/QuickCheck/2.1.0.3.nix {
+    inherit cabal mtl;
+  };
+
   QuickCheck2 = import ../development/libraries/haskell/QuickCheck/QuickCheck-2.nix {
     inherit cabal mtl;
   };
@@ -604,6 +696,10 @@ rec {
     inherit cabal mtl;
   };
 
+  regexBase0932 = import ../development/libraries/haskell/regex-base/0.93.2.nix {
+    inherit cabal mtl;
+  };
+
   regexBase = import ../development/libraries/haskell/regex-base {
     inherit cabal mtl;
   };
@@ -614,6 +710,12 @@ rec {
     regexPosix = regexPosix0941;
   };
 
+  regexCompat0931 = import ../development/libraries/haskell/regex-compat/0.93.1.nix {
+    inherit cabal;
+    regexBase = regexBase0932;
+    regexPosix = regexPosix0942;
+  };
+
   regexCompat = import ../development/libraries/haskell/regex-compat {
     inherit cabal regexBase regexPosix;
   };
@@ -623,6 +725,11 @@ rec {
     regexBase = regexBase0931;
   };
 
+  regexPosix0942 = import ../development/libraries/haskell/regex-posix/0.94.2.nix {
+    inherit cabal;
+    regexBase = regexBase0932;
+  };
+
   regexPosix = import ../development/libraries/haskell/regex-posix {
     inherit cabal regexBase;
   };
@@ -716,6 +823,10 @@ rec {
     inherit cabal;
   };
 
+  stm2121 = import ../development/libraries/haskell/stm/2.1.2.1.nix {
+    inherit cabal;
+  };
+
   storableComplex = import ../development/libraries/haskell/storable-complex {
     inherit cabal;
   };
@@ -811,6 +922,15 @@ rec {
     inherit cabal utf8String terminfo;
   };
 
+  webRoutes = import ../development/libraries/haskell/web-routes {
+    inherit cabal utf8String parsec;
+    network = network2217;
+  };
+
+  webRoutesQuasi = import ../development/libraries/haskell/web-routes-quasi {
+    inherit cabal webRoutes;
+  };
+
   WebServer = import ../development/libraries/haskell/WebServer {
     inherit cabal network mtl parsec;
     inherit (pkgs) fetchgit;
@@ -911,6 +1031,11 @@ rec {
     inherit (pkgs) perl;
   };
 
+  alex233 = import ../development/tools/parsing/alex/2.3.3.nix {
+    inherit cabal;
+    inherit (pkgs) perl;
+  };
+
   cpphs = import ../development/tools/misc/cpphs {
     inherit cabal;
   };
@@ -944,6 +1069,13 @@ rec {
     ghcPaths = ghcPaths0106;
   };
 
+  haddock272P = import ../development/tools/documentation/haddock/haddock-2.7.2.nix {
+    inherit cabal;
+    alex = alex233;
+    happy = happy1185;
+    ghcPaths = ghcPaths0106;
+  };
+
   happy = happy1184;
 
   happy117 = import ../development/tools/parsing/happy/happy-1.17.nix {
@@ -956,6 +1088,11 @@ rec {
     inherit (pkgs) perl;
   };
 
+  happy1185 = import ../development/tools/parsing/happy/happy-1.18.5.nix {
+    inherit cabal mtl;
+    inherit (pkgs) perl;
+  };
+
   hlint = import ../development/tools/haskell/hlint {
     inherit cabal haskellSrcExts mtl uniplate hscolour parallel;
   };
@@ -1006,6 +1143,13 @@ rec {
 
   # Tools.
 
+  cabalInstall082 = import ../tools/package-management/cabal-install/0.8.2.nix {
+    inherit cabal;
+    HTTP = HTTP400009;
+    network = network2217;
+    zlib = zlib0520;
+  };
+
   cabalInstall080 = import ../tools/package-management/cabal-install/0.8.0.nix {
     inherit cabal;
     HTTP = HTTP400009;
@@ -1018,7 +1162,7 @@ rec {
   };
 
   lhs2tex = import ../tools/typesetting/lhs2tex {
-    inherit cabal regexCompat utf8String;
+    inherit cabal regexCompat;
     inherit (pkgs) tetex polytable;
   };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dadc8690796..e14c5244d56 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2186,6 +2186,7 @@ rec {
       sha256 = "a023649603240e7a19fc52a8316a41c854639c0600058ea4d1e436fe1b1b7734";
     };
     propagatedBuildInputs = [LWP XMLLibXML XMLParser];
+    doCheck = false;
   };
 
   ReturnValue = buildPerlPackage {
@@ -2814,11 +2815,12 @@ rec {
   };
 
   XMLLibXML = buildPerlPackage {
-    name = "XML-LibXML-1.66";
+    name = "XML-LibXML-1.70";
     src = fetchurl {
-      url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.66.tar.gz;
-      sha256 = "1a0bdiv3px6igxnbbjq10064iahm8f5i310p4y05w6zn5d51awyl";
+      url = mirror://cpan/authors/id/P/PA/PAJAS/XML-LibXML-1.70.tar.gz;
+      sha256 = "181viglnw93kz9w3bvs8dqvx4xnqvf448vnwam8dia9bfw3czrjk";
     };
+    SKIP_SAX_INSTALL=1;
     buildInputs = [pkgs.libxml2];
     propagatedBuildInputs = [XMLLibXMLCommon XMLSAX];
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3bd40d9ad4c..dbaa21f49b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4,11 +4,11 @@ rec {
   inherit (pkgs) fetchurl fetchsvn stdenv;
 
   argparse = buildPythonPackage (rec {
-    name = "argparse-0.9.1";
+    name = "argparse-1.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip";
-      sha256 = "00jw32wwccpf9smraywjk869b93w7f99rw8gi63yfhw6379fnq6m";
+      sha256 = "ee6da1aaad8b08a74a33eb82264b1a2bf12a7d5aefc7e9d7d40a8f8fa9912e62";
     };
 
     buildInputs = [ pkgs.unzip ];
@@ -117,11 +117,11 @@ rec {
   });
 
   darcsver = buildPythonPackage (rec {
-    name = "darcsver-1.3.1";
+    name = "darcsver-1.5.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz";
-      sha256 = "1a5cl2yhnd88a4vkc9r381cbjkcvga87dp9zx5av68857q1nvvvq";
+      sha256 = "e643d607f27e4b8cc96565432ff1abdc2af5e9061c70798e2f33e78c07b66b3a";
     };
 
     # Note: We don't actually need to provide Darcs as a build input.
@@ -156,11 +156,11 @@ rec {
   });
 
   foolscap = buildPythonPackage (rec {
-    name = "foolscap-0.4.2";
+    name = "foolscap-0.5.1";
 
     src = fetchurl {
       url = "http://foolscap.lothar.com/releases/${name}.tar.gz";
-      sha256 = "14g89kjxxci3ssl9jgvpkyrcq62g361aw8pamlkclk8nnrh4f776";
+      sha256 = "c7dfb6f9331e05a8d9553730493b4740c7bf4b4cd68ba834061f0ca0d455492d";
     };
 
     propagatedBuildInputs = [ twisted pkgs.pyopenssl ];
@@ -293,6 +293,55 @@ rec {
     };
   });
 
+  mock = buildPythonPackage (rec {
+    name = "mock-0.1.0";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/python-mock/pythonmock-0.1.0.zip";
+      sha256 = "0r17f8sjq6pjlfh2sq2x80bd5r6y9sb3n5l05x5sf25iaba7sg9z";
+    };
+
+    buildInputs = [ pkgs.unzip ];
+
+    phases = "unpackPhase";
+
+    unpackPhase =
+      '' mkdir "${name}"
+         unzip "$src"
+
+         ensureDir "$out/lib/${python.libPrefix}/site-packages"
+         cp -v mock.py "$out/lib/${python.libPrefix}/site-packages"
+      '';
+
+    meta = {
+      description = "Mock objects for Python";
+
+      homepage = http://python-mock.sourceforge.net/;
+
+      license = "mBSD";
+    };
+  });
+
+  mock060 = pkgs.lowPrio (buildPythonPackage (rec {
+    # TODO: This appears to be an unofficially hacked version of 'mock'
+    #       from above. This could probably replace the previous
+    #       package, but I don't have time to test that right now.
+    name = "mock-0.6.0";
+
+    src = fetchurl {
+      url = "http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/${name}.tar.bz2";
+      sha256 = "1vwxzr2sjyl3x5jqgz9swpmp6cyhmwmab65akysfglf6acmn3czf";
+    };
+    doCheck = false;            # Package doesn't have any tests.
+
+    meta = {
+      description = "Mock objects for Python, provided by tahoe-lafs.org";
+      homepage = "http://python-mock.sourceforge.net/";
+      license = "mBSD";
+    };
+  }));
+
+
   namebench = buildPythonPackage (rec {
     name = "namebench-1.0.5";
 
@@ -327,11 +376,12 @@ rec {
   });
 
   nevow = buildPythonPackage (rec {
-    name = "nevow-0.9.33";
+    name = "nevow-${version}";
+    version = "0.10.0";
 
     src = fetchurl {
-      url = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.33.tar.gz?format=raw";
-      sha256 = "1b6zhfxx247b60n1qi2hrawhiaah88v8igg37pf7rjkmvy2z1c6c";
+      url = "http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-${version}.tar.gz?format=raw";
+      sha256 = "90631f68f626c8934984908d3df15e7c198939d36be7ead1305479dfc67ff6d0";
       name = "${name}.tar.gz";
     };
 
@@ -366,6 +416,22 @@ rec {
     };
   });
 
+  notify = pkgs.stdenv.mkDerivation (rec {
+    name = "python-notify-0.1.1";
+
+    src = fetchurl {
+      url = http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2;
+      sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx";
+    };
+
+    buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.gtkLibs.glib pkgs.gtkLibs.gtk pkgs.dbus_glib ];
+
+    meta = {
+      description = "Python bindings for libnotify";
+      homepage = http://www.galago-project.org/;
+    };
+  });
+
   numpy = buildPythonPackage ( rec {
     name = "numpy-1.4.1";
 
@@ -374,16 +440,16 @@ rec {
       sha256 = "01lf3nc2lp1qkrqnnar50vb7i6y07d1zs6f9yc3kw4p5fd2vhyrf";
     };
 
+    # TODO: add ATLAS=${pkgs.atlas}
+    installCommand = ''
+      export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
+      python setup.py build --fcompiler="gnu95"
+      python setup.py install --root="$out"
+    '';
     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.
+    buildInputs = [ pkgs.gfortran ];
+    propagatedBuildInputs = [ pkgs.liblapack pkgs.blas ];
 
     meta = {
       description = "Scientific tools for Python";
@@ -443,15 +509,35 @@ rec {
     };
   };
 
+  pyasn1 = buildPythonPackage ({
+    name = "pyasn1-0.0.11a";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/pyasn1/pyasn1-devel/0.0.11a/pyasn1-0.0.11a.tar.gz";
+      sha256 = "0b7q67ygdk48zn07pyhyg7r0b74gds50652ndpzfw4vs8l3vjg0b";
+    };
+
+    meta = {
+      description = "ASN.1 tools for Python";
+
+      homepage = http://pyasn1.sourceforge.net/;
+
+      license = "mBSD";
+
+      platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    };
+  });
+
   pycryptopp = buildPythonPackage (rec {
-    name = "pycryptopp-0.5.15";
+    name = "pycryptopp-0.5.19";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz";
-      sha256 = "0f8v3cs8vjpj423yx3ikj7qjvljrm86x0qpkckidv69kah8kndxa";
+      sha256 = "6b610b3e5742d366d4fbe96b5f20d8459db9aba4fb802e6e5aab547f22ad04b9";
     };
 
-    # Use our own copy of Crypto++.
+    # Prefer crypto++ library from the Nix store over the one that's included
+    # in the pycryptopp distribution.
     preConfigure = "export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1";
 
     buildInputs = [ setuptoolsDarcs darcsver pkgs.cryptopp ];
@@ -551,15 +637,18 @@ rec {
   });
 
   pyutil = buildPythonPackage (rec {
-    name = "pyutil-1.3.30";
+    name = "pyutil-1.7.9";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyutil/${name}.tar.gz";
-      sha256 = "1ksb4gn8x53wcyddmjv1ma8cvvhjlmfxc6kpszyhb838i7xzla19";
+      sha256 = "c303bb779f96073820e2eb7c9692fe15a57df491eb356839f3cb3377ed03b844";
     };
 
-    buildInputs = [ setuptoolsDarcs ];
-    propagatedBuildInputs = [ zbase32 argparse ];
+    buildInputs = [ setuptoolsDarcs setuptoolsTrial ] ++ (if doCheck then [ simplejson ] else []);
+    propagatedBuildInputs = [ zbase32 argparse twisted ];
+    # Tests fail because they try to write new code into the twisted
+    # package, apparently some kind of plugin.
+    doCheck = false;
 
     meta = {
       description = "Pyutil, a collection of mature utilities for Python programmers";
@@ -599,15 +688,16 @@ rec {
   });
 
   setuptoolsDarcs = buildPythonPackage {
-    name = "setuptools-darcs-1.2.8";
+    name = "setuptools-darcs-1.2.9";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/s/setuptools_darcs/setuptools_darcs-1.2.8.tar.gz";
-      sha256 = "0jg9q9mhsky444mm7lpmmlxai8hmjg4pc71viv4kni8gls0gk9n8";
+      url = "http://pypi.python.org/packages/source/s/setuptools_darcs/setuptools_darcs-1.2.9.tar.gz";
+      sha256 = "d37ce11030addbd729284c441facd0869cdc6e5c888dc5fa0a6f1edfe3c3e617";
     };
 
     # In order to break the dependency on darcs -> ghc, we don't add
     # darcs as a propagated build input.
+    propagatedBuildInputs = [ darcsver ];
 
     meta = {
       description = "setuptools plugin for the Darcs version control system";
@@ -619,11 +709,11 @@ rec {
   };
 
   setuptoolsTrial = buildPythonPackage {
-    name = "setuptools-trial-0.5.3";
+    name = "setuptools-trial-0.5.9";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.5.3.tar.gz";
-      sha256 = "0h3mgjsz3z1sjl9j0b6bv4bss8d0przamj4gnjmpyazc633hhlyi";
+      url = "http://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.5.9.tar.gz";
+      sha256 = "4e3b5a183b9cf6ff637777c9852dfe8eaab156289e7a578525d68b1cfb3c9f29";
     };
 
     propagatedBuildInputs = [ twisted ];
@@ -638,12 +728,11 @@ rec {
   };
 
   simplejson = buildPythonPackage (rec {
-    name = "simplejson-2.0.9";
+    name = "simplejson-2.1.1";
 
-    src = fetchsvn {
-      url = "http://simplejson.googlecode.com/svn/tags/${name}";
-      sha256 = "a48d5256fdb4f258c33da3dda110ecf3c786f086dcb08a01309acde6d1ddb921";
-      rev = "172";  # to be on the safe side
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz";
+      sha256 = "8c1c833c5b997bf7b75bf9a02a2d2884b8427816228eac0fb84791be44d2f612";
     };
 
     meta = {
@@ -685,11 +774,11 @@ rec {
   };
 
   twisted = buildPythonPackage {
-    name = "twisted-10.0.0";
+    name = "twisted-10.1.0";
 
     src = fetchurl {
-      url = http://tmrc.mit.edu/mirror/twisted/Twisted/10.0/Twisted-10.0.0.tar.bz2;
-      sha256 = "1cbqpvwdwsc2av43fyqqdyyxs2j3drbagnl9m5vk7fl9k5q8q4fv";
+      url = http://tmrc.mit.edu/mirror/twisted/Twisted/10.1/Twisted-10.1.0.tar.bz2;
+      sha256 = "eda6e0e9e5ef6f6c19ab75bcb094f83a12ee25fe589fbcddf946e8a655c8070b";
     };
 
     propagatedBuildInputs = [ zopeInterface ];
@@ -718,11 +807,11 @@ rec {
   };
 
   zbase32 = buildPythonPackage (rec {
-    name = "zbase32-1.1.1";
+    name = "zbase32-1.1.2";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zbase32/${name}.tar.gz";
-      sha256 = "0n59l4rs26vrhxpsfrwybjjir68aj23f09k1yjnbxqy5n0khp8gm";
+      sha256 = "2f44b338f750bd37b56e7887591bf2f1965bfa79f163b6afcbccf28da642ec56";
     };
 
     # Tests require `pyutil' so disable them to avoid circular references.
@@ -740,11 +829,11 @@ rec {
   });
 
   zfec = buildPythonPackage (rec {
-    name = "zfec-1.4.4";
+    name = "zfec-1.4.7";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/z/zfec/${name}.tar.gz";
-      sha256 = "0rgg7nsvbr4f9xmiclzypc39fnivg23kldv5aa8si0bgsxn6mh6w";
+      sha256 = "3335c9054f45e2c59188400e892634b68761b29d06f3cafe525c60484902d379";
     };
 
     buildInputs = [ setuptoolsDarcs ];
@@ -769,10 +858,10 @@ rec {
   });
 
   zopeInterface = buildPythonPackage {
-    name = "zope-interface-3.3.0";
+    name = "zope-interface-3.6.1";
     src = fetchurl {
-      url = http://www.zope.org/Products/ZopeInterface/3.3.0/zope.interface-3.3.0.tar.gz;
-      sha256 = "0xahg9cmagn4j3dbifvgzbjliw2jdrbf27fhqwkdp8j80xpyyjf0";
+      url = "http://pypi.python.org/packages/source/z/zope.interface/zope.interface-3.6.1.tar.gz";
+      sha256 = "294c3c0529e84169177bce78d616c768fa1c028a2fbc1854f615d32ed88dbc6c";
     };
 
     doCheck = false;
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 63cae5f41c2..91d7b7a5adf 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -149,6 +149,7 @@ let
     withTLS = true;
     platform = pkgs.platforms.pc;
     libc = "glibc";
+    openssl.system = "hurd-x86";  # Nix depends on OpenSSL.
   };
 in {
   crossGNU = mapTestOnCross crossSystem {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 77bcb8e8794..001492d9d60 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -216,6 +216,7 @@ with (import ./release-lib.nix);
   nfsUtils = linux;
   nix = all;
   nixUnstable = all;
+  nixSqlite = all;
   nmap = linux;
   nss_ldap = linux;
   nssmdns = linux;
@@ -255,9 +256,6 @@ with (import ./release-lib.nix);
   pythonFull = linux;
   sbcl = all;
   qt3 = linux;
-  qt4 = linux;
-  qt45 = linux;
-  qt46 = linux;
   quake3demo = linux;
   readline = all;
   reiserfsprogs = linux;
@@ -414,12 +412,11 @@ with (import ./release-lib.nix);
   haskellPackages_ghc6104 = {
     darcs = ghcSupported;
     ghc = ghcSupported;
+    gitit = linux;
     gtk2hs = linux;
     leksah = linux;
-    lhs2tex = ghcSupported;
-    haskellPlatform = ghcSupported;
+    haskellPlatform2009202 = ghcSupported;
     xmonad = linux;
-    gitit = linux;
   };
 
   haskellPackages_ghc6121 = {
@@ -434,6 +431,14 @@ with (import ./release-lib.nix);
     haskellPlatform2010100 = ghcSupported;
   };
 
+  haskellPackages_ghc6123 = {
+    darcs = ghcSupported;
+    ghc = ghcSupported;
+    haskellPlatform2010200 = ghcSupported;
+    lhs2tex = ghcSupported;
+    xmonad = linux;
+  };
+
   kde3 = {
     kdebase = linux;
     kdelibs = linux;
@@ -471,6 +476,7 @@ with (import ./release-lib.nix);
     konversation = linux;
     kdesvn = linux;
     amarok = linux;
+    k3b = linux;
     l10n.ca = linux;
     l10n.de = linux;
     l10n.fr = linux;