diff -ur --unidirectional-new-file vim70/runtime/doc/Makefile vim+async+ecl-70/runtime/doc/Makefile --- vim70/runtime/doc/Makefile 2006-04-27 11:17:05.000000000 -0400 +++ vim+async+ecl-70/runtime/doc/Makefile 2006-06-08 06:57:08.000000000 -0400 @@ -38,6 +38,7 @@ help.txt \ howto.txt \ if_cscop.txt \ + if_ecl.txt \ if_mzsch.txt \ if_ole.txt \ if_perl.txt \ Binary files vim70/runtime/doc/doctags and vim+async+ecl-70/runtime/doc/doctags differ diff -ur --unidirectional-new-file vim70/runtime/doc/if_ecl.txt vim+async+ecl-70/runtime/doc/if_ecl.txt --- vim70/runtime/doc/if_ecl.txt 1969-12-31 19:00:00.000000000 -0500 +++ vim+async+ecl-70/runtime/doc/if_ecl.txt 2006-06-08 06:27:09.000000000 -0400 @@ -0,0 +1,88 @@ +*if_ecl.txt* For Vim version 6.4. Last change: 2006 09 March + + + VIM REFERENCE MANUAL by Eirik A. Nygaard + + +Ecl *ecl* + +1. ECL commands |ecl-commands| +2. Vim package |vim-package| + +============================================================================== +1. ECL commands *ecl-commands* + + *:ecl* +:ecl {cmd} Executes {cmd} as a lisp expression. + +:ecl << {endpattern} +{script} +{endpattern} + Executes {script} as a lisp expression. If the + {endpattern} is omitted it defaults to '.' (a dot). + +Example script: + function! ECL_version() + ecl << EOF + (format t "Running ~A ~A" + (CL:LISP-IMPLEMENTATION-TYPE) + (CL:LISP-IMPLEMENTATION-VERSION)) + EOF + endfunction + +:[range]ecl Executes the content in [range] as a lisp expression. + +============================================================================== +2. Vim package *vim-package* + +To access Vim with ECL you have to use the VIM package. + +Overview + (msg string) Print a message. + (execute string) Execute a Vim ex command. + (expr string) Evaluates string as a Vim expression. + Returning the result as a string, or NIL on + failure. + (add-input-listener stream callback) + Register callback to be invoked when data + arrives on stream. + (remove-input-listener stream) + Unregister callback on stream. + range A variable containing a cons of start line and + end line, set when :ecl is called. + + (windows) Returns a list of Vim's windows. + (current-window) Returns the current window. + (window-width &optional window) + Returns width of window, if no argument is + given, it defaults to the current window. + (window-height &optional window) + Returns height of window, if no argument is + given, it defaults to the current window. + (window-cursor &optional window) + Returns the position of the curser as a cons + (lnum . col) in window, window defaults to + the current window. + (window-buffer &optional window) + Returns the buffer in window, defaults to the + current window. + + (buffers) Returns all buffers. + (current-buffer) Returns the current buffer. + (buffer-line-count &optional buffer) + Number of lines in buffer, the buffer defaults + to the current buffer. + (buffer-lines &key buffer start end) + Returns the lines in buffer from start to + end (inclusive). Defaults: start 1, end + lines in buffer, and buffer to the current + buffer. + + (get-line n) Returns line number n. + (replace-lines lines :start x :end y :buffer buf) + Replace lines from x to y (inclusive) with the + content of the lines (a list of strings) in + buffer buf. Defaults: :start 1, :end lines in + buffer, and :buffer to the current buffer. + + vim:tw=78:ts=8:ft=help:norl: diff -ur --unidirectional-new-file vim70/runtime/doc/tags vim+async+ecl-70/runtime/doc/tags --- vim70/runtime/doc/tags 2006-05-07 09:33:26.000000000 -0400 +++ vim+async+ecl-70/runtime/doc/tags 2006-06-08 07:38:55.000000000 -0400 @@ -1999,6 +1999,7 @@ :echom eval.txt /*:echom* :echomsg eval.txt /*:echomsg* :echon eval.txt /*:echon* +:ecl if_ecl.txt /*:ecl* :edit editing.txt /*:edit* :edit! editing.txt /*:edit!* :edit!_f editing.txt /*:edit!_f* @@ -5007,6 +5008,8 @@ dying-variable eval.txt /*dying-variable* e motion.txt /*e* easy starting.txt /*easy* +ecl if_ecl.txt /*ecl* +ecl-commands if_ecl.txt /*ecl-commands* edit-a-file editing.txt /*edit-a-file* edit-binary editing.txt /*edit-binary* edit-dialogs editing.txt /*edit-dialogs* @@ -5641,6 +5644,7 @@ hebrew.txt hebrew.txt /*hebrew.txt* help various.txt /*help* help-context help.txt /*help-context* +help-tags tags 1 help-translated various.txt /*help-translated* help-xterm-window various.txt /*help-xterm-window* help.txt help.txt /*help.txt* @@ -5870,6 +5874,7 @@ idl-syntax syntax.txt /*idl-syntax* idl.vim syntax.txt /*idl.vim* if_cscop.txt if_cscop.txt /*if_cscop.txt* +if_ecl.txt if_ecl.txt /*if_ecl.txt* if_mzsch.txt if_mzsch.txt /*if_mzsch.txt* if_ole.txt if_ole.txt /*if_ole.txt* if_perl.txt if_perl.txt /*if_perl.txt* @@ -7645,6 +7650,7 @@ vim-modes intro.txt /*vim-modes* vim-modes-intro intro.txt /*vim-modes-intro* vim-multibyte intro.txt /*vim-multibyte* +vim-package if_ecl.txt /*vim-package* vim-script-intro usr_41.txt /*vim-script-intro* vim-variable eval.txt /*vim-variable* vim.vim syntax.txt /*vim.vim* diff -ur --unidirectional-new-file vim70/runtime/if_ecl.lisp vim+async+ecl-70/runtime/if_ecl.lisp --- vim70/runtime/if_ecl.lisp 1969-12-31 19:00:00.000000000 -0500 +++ vim+async+ecl-70/runtime/if_ecl.lisp 2006-06-08 06:27:09.000000000 -0400 @@ -0,0 +1,578 @@ +; vim:ts=8 + +(in-package :vim) + +(shadow '(append funcall setq)) + +(export + '(; Implemented in if_ecl.c; probably use "internal" data structures. + cmd expr + add-input-listener remove-input-listener + windows current-window window-width window-height window-cursor window-buffer + buffers current-buffer buffer-line-count buffer-lines buffer-name + replace-lines append-line-to-buffer append-to-buffer + eval-range + + ; Use or return "internal" data structures. + find-buffer get-line + + ; Wrapped Vim functions + append argc argidx argv browse bifexists buflisted bufloaded bufname bufnr + bufwinnr num-buffers bufinnr byte2line char2nr cindent col confirm + cursor + expand + getline + getwinposx getwinposy + line + lispindent + setline + virtcol + winbufnr wincol winheight winline winnr + winwidth + + ; Utility functions + execute funcall setq var var-n var-s + change-to-buffer + get-pos goto-pos + point bufnr-of line-of col-of virtcol-of winline-of + scroll-window position-window + append-text-to-buffer multi-line-map append-multi-line-string + normal + + ; Macros + get-pos-after with-buffer with-options + )) + +(defun cmd (str &rest rest) + "Executes an ex command, e.g. \"w\" or \"help ecl\". + NOTE: This is exactly the same as typing in the command at the Vim colon-prompt. If + you want \":exec ...\", use vim:execute." + (check-type str string) + (when rest + (setf str (apply #'concatenate 'string str rest))) + (execute-int str)) + +(defun execute (str &rest rest) + (when rest + (setf str (apply #'concatenate 'string str rest))) + (cmd "exec \"" str "\"")) + +(defun expr (str) + "Evaluates a Vim expression; returns the result as a string, or NIL" + (check-type str string) + (expr-int str)) + +(let ((callbacks (make-hash-table))) + ;; the hashtable is kept to ensure callback closures + ;; are not garbage collected. + + (defun add-input-listener (stream callback) + "Registers a callback to be invoked when data arrives to a stream" + (check-type stream stream) + (check-type callback function) + (setf (gethash stream callbacks) callback) + (add-input-listener-int stream `(safe-eval '(cl:funcall ,callback) nil)) + t) + + (defun remove-input-listener (stream) + "Unregisters the input-listener for a stream" + (check-type stream stream) + (remove-input-listener-int stream) + (remhash stream callbacks) + t)) + +(defun windows () + "returns a list of vim's windows" + (windows-int)) + +(defun current-window () + "returns the current window" + (current-window-int)) + +(defun window-width (&optional (window (current-window))) + "returns the width of a window (defaults to (current-window))" + (window-width-int window)) + +(defun window-height (&optional (window (current-window))) + "returns the height of a window (defaults to (current-window))" + (window-height-int window)) + +(defun window-cursor (&optional (window (current-window))) + "returns the cursor of a window (defaults to (current-window)) cursors + are (lnum . col) cons cells" + (window-cursor-int window)) + +(defun window-buffer (&optional (window (current-window))) + "returns the buffer of a window (defaults to (current-window))" + (window-buffer-int window)) + +(defun buffers () + "returns a list of vim's buffers" + (buffers-int)) + +(defun current-buffer () + "returns the current buffer" + (current-buffer-int)) + +(defun buffer-line-count (&optional (buffer (current-buffer))) + "returns the line count of a buffer (defaults to (current-buffer))" + (buffer-line-count-int buffer)) + +(defun buffer-lines (&key (buffer (vim:current-buffer)) + (start 0) (end (vim:buffer-line-count buffer))) + "returns the lines from :start to :end in :buffer + (defaults to (current-buffer)) + :start and :end are in the range 0..(buffer-line-count) + :start is inclusive, :end is excluded + If (= :start :end), the return will be NIL + To print a single line :start n :end n+1" + (check-type start fixnum) + (check-type end fixnum) + (buffer-lines-int buffer start end)) + +(defun buffer-name (&key (buffer (vim:current-buffer))) + (buffer-name-int buffer)) + +(defun find-buffer (name) + (find-if (lambda (b) (string= name (vim:buffer-name :buffer b))) (vim:buffers))) + +(defun replace-lines (lines &key (start 0) end (buffer (vim:current-buffer))) + "replaces the lines from :start to :end in :buffer with the given list of strings + :start and :end are in the range 0..(buffer-line-count) + :start is inclusive, :end is excluded + If :start == :end, then you insert a new line before :start + To insert a new line at the very beginning of a buffer, :start = :end = 0" + (check-type start fixnum) + (check-type end fixnum) + (replace-lines-int buffer lines + start (or end (vim:buffer-line-count buffer)) + 0 (length lines))) + +(defun get-line (&optional (line (car (window-cursor))) + (buffer (vim:current-buffer))) + "gets a line from a buffer" + (check-type line fixnum) + (first (vim:buffer-lines :buffer buffer :start line :end (1+ line)))) + +(defun append-line-to-buffer (string &key (buffer (vim:current-buffer))) + (let ((end-line (vim:buffer-line-count buffer))) + (replace-lines (list string) :buffer buffer :start end-line :end end-line))) + +(defun append-to-buffer (string &key (buffer (vim:current-buffer))) + (let* ((end-line (1- (vim:buffer-line-count buffer))) + (existing (get-line end-line buffer))) + (replace-lines (list (concatenate 'string existing string)) :buffer buffer :start end-line :end (1+ end-line)))) + +(defun eval-range () + "called when the :ecl command is issued without an argument" + (with-input-from-string (s (format nil + "~{~a~%~}" + (vim:buffer-lines :buffer (vim:current-buffer) + :start (car vim:range) + :end (1+ (cdr vim:range))))) + (loop for form = (read s nil nil) + while form + do (eval form)))) + +(defparameter *returns-integer* (make-hash-table :test #'equal) + "Stores the Vim functions that return integers, so vim:funcall can parse the +string returned from Vim, if appropriate.") + +(defun returns-integer (f) + (setf (gethash f *returns-integer*) t)) + +(defun returns-integer-p (f) + (gethash f *returns-integer*)) + +(mapcar #'returns-integer + '("append" "argc" "argidx" "bufexists" "buflisted" "bufloaded" "bufnr" + "bufwinnr" "byte2line" "char2nr" "cindent" "col" "confirm" + "cscope_connection" "cursor" "delete" "did_filetype" "eventhandler" + "executable" "exists" "filereadable" "filewritable" "foldclosed" + "foldclosedend" "foldlevel" "foreground" "getchar" "getcharmod" + "getcmdpos" "getfsize" "getftime" "getwinposx" "getwinposy" "has" + "hasmapto" "histnr" "hlexists" "hlID" "indent" "inputrestore" "inputsave" + "isdirectory" "libcallnr" "line" "line2byte" "lispindent" "localtime" + "match" "matchend" "nextnonblank" "prevnonblank" "remote_foreground" + "remote_peek" "rename" "search" "searchpair" "server2client" "setcmdpos" + "setline" "setreg" "stridx" "strlen" "strridx" "synID" "synIDtrans" "type" + "virtcol" "winbufnr" "wincol" "winheight" "winline" "winnr" "winwidth")) + +(defun build-vim-funcall (function-name args) + (with-output-to-string (s) + (princ function-name s) + (princ "(" s) + (loop for (arg . rest) on args + do (prin1 arg s) + if rest do (princ "," s)) + (princ ")" s))) + +(defun vim:funcall (function-name &rest args) + (let ((result (vim:expr (build-vim-funcall function-name args)))) + (if (gethash function-name *returns-integer*) + (parse-integer result) + result))) + +;;; ###################################################################### +;;; Vim FFI +;;; ###################################################################### + +(defmacro def-vim-function (name args arg-xlate-functions result-xlat-function + &optional documentation) + (unless (and (typep args 'list) + (typep arg-xlate-functions 'list)) + (error + "In def-vim-function of ~S, args and arg-xlate-functions must both be lists, not ~S and ~S." + name args arg-xlate-functions)) + (flet ((lambda-list-keyword-p (x) (and (atom x) + (eql #\& (char (string x) 0)))) + (apply-xlat-function (f arg) + (when (listp arg) (setf arg (car arg))) + (if (eq f 't) + arg + (if (atom f) + (list f arg) + f)))) + (let* ((parsed-args + (loop for item in args + if (listp item) collect (car item) + else unless (lambda-list-keyword-p item) collect item)) + (xlated-args (loop for f in arg-xlate-functions + for arg in parsed-args + if f collect (apply-xlat-function f arg))) + (funcall-expression `(vim:funcall ,name ,@xlated-args))) + `(defun ,(intern (string-upcase name) :vim) ,args + ,documentation + ,(if (eq 't result-xlat-function) + funcall-expression + (if (atom result-xlat-function) + `(,result-xlat-function ,funcall-expression) + `(let ((result ,funcall-expression)) + ,result-xlat-function))))))) + +(defun string-or-number (lnum) + (etypecase lnum + (string lnum) + (number (1+ lnum)))) + +(defun t-or-number (expr) + (if (eql expr t) + 0 + (1+ expr))) + +(defun t-string-or-number (expr) + (if (eql expr t) + 0 + (string-or-number expr))) + +(defun nil-or-number (expr) + (if expr (1+ expr) 0)) + +(defun result-number-or-nil (result) + (if (plusp result) (1- result) nil)) + +(defun join-with-newlines (list) + (apply #'concatenate 'string + (loop for (item . rest) on list + collect item + if rest collect (string #\Newline)))) + +(def-vim-function "append" (lnum string) (nil-or-number t) t) +(def-vim-function "argc" () () t) +(def-vim-function "argidx" () () t) +(def-vim-function "argv" (n) (t) t) +(def-vim-function "browse" (save title initdir default) ((if save 1 0) t t t) t) +(def-vim-function "bufexists" (expr) (t-string-or-number) plusp + "Use T to find out about the alternate file name.") +(def-vim-function "buflisted" (expr) (t-string-or-number) plusp + "Use T to find out about the alternate file name.") +(def-vim-function "bufloaded" (expr) (t-string-or-number) plusp + "Use T to find out about the alternate file name.") +(def-vim-function "bufname" (expr) (t-string-or-number) t + "Use T to find out about the alternate file name.") + +(def-vim-function "bufnr" (&optional (expr ".")) (t-string-or-number) result-number-or-nil) +(defun num-buffers () (1+ (vim:bufnr "$"))) + +(def-vim-function "bufwinnr" (expr) (t-string-or-number) result-number-or-nil) + +(def-vim-function "byte2line" (byte-count) (1+) 1-) +(def-vim-function "char2nr" (expr) (t) t) +(def-vim-function "cindent" (lnum) (string-or-number) 1-) +(def-vim-function "col" (expr) (t) 1-) + +(def-vim-function "confirm" (msg &optional (choices "&Ok") (default 0) (type "Generic")) + (join-with-newlines + join-with-newlines + (if default (1+ default) 0) + nil) + result-number-or-nil + "For MSG and CHOICES, give lists of strings instead of single strings.") + +(def-vim-function "cursor" (lnum col) (nil-or-number nil-or-number) 't + "position cursor at {lnum}, {col}; returns T") + +; delete( {fname}) Number delete file {fname} +; did_filetype() Number TRUE if FileType autocommand event used +; escape( {string}, {chars}) String escape {chars} in {string} with '\' +; eventhandler( ) Number TRUE if inside an event handler +; executable( {expr}) Number 1 if executable {expr} exists +; exists( {expr}) Number TRUE if {expr} exists + +(def-vim-function "expand" (expr &optional flag) (t (if flag 1 0)) t + "Use t/nil for the flag.") + +; filereadable( {file}) Number TRUE if {file} is a readable file +; filewritable( {file}) Number TRUE if {file} is a writable file +; fnamemodify( {fname}, {mods}) String modify file name +; foldclosed( {lnum}) Number first line of fold at {lnum} if closed +; foldclosedend( {lnum}) Number last line of fold at {lnum} if closed +; foldlevel( {lnum}) Number fold level at {lnum} +; foldtext( ) String line displayed for closed fold +; foreground( ) Number bring the Vim window to the foreground +; getchar( [expr]) Number get one character from the user +; getcharmod( ) Number modifiers for the last typed character +; getbufvar( {expr}, {varname}) variable {varname} in buffer {expr} +; getcmdline() String return the current command-line +; getcmdpos() Number return cursor position in command-line +; getcwd() String the current working directory +; getfsize( {fname}) Number size in bytes of file +; getftime( {fname}) Number last modification time of file + +(def-vim-function "getline" (lnum) (string-or-number) t + "line {lnum} from current buffer") + +; getreg( [{regname}]) String contents of register +; getregtype( [{regname}]) String type of register + +(def-vim-function "getwinposx" () () result-number-or-nil + "X coord in pixels of GUI Vim window") +(def-vim-function "getwinposy" () () result-number-or-nil + "Y coord in pixels of GUI Vim window") + +; getwinvar( {nr}, {varname}) variable {varname} in window {nr} +; glob( {expr}) String expand file wildcards in {expr} +; globpath( {path}, {expr}) String do glob({expr}) for all dirs in {path} +; has( {feature}) Number TRUE if feature {feature} supported +; hasmapto( {what} [, {mode}]) Number TRUE if mapping to {what} exists +; histadd( {history},{item}) String add an item to a history +; histdel( {history} [, {item}]) String remove an item from a history +; histget( {history} [, {index}]) String get the item {index} from a history +; histnr( {history}) Number highest index of a history +; hlexists( {name}) Number TRUE if highlight group {name} exists +; hlID( {name}) Number syntax ID of highlight group {name} +; hostname() String name of the machine Vim is running on +; iconv( {expr}, {from}, {to}) String convert encoding of {expr} +; indent( {lnum}) Number indent of line {lnum} +; input( {prompt} [, {text}]) String get input from the user +; inputdialog( {p} [, {t} [, {c}]]) String like input() but in a GUI dialog +; inputrestore() Number restore typeahead +; inputsave() Number save and clear typeahead +; inputsecret( {prompt} [, {text}]) String like input() but hiding the text +; isdirectory( {directory}) Number TRUE if {directory} is a directory +; libcall( {lib}, {func}, {arg}) String call {func} in library {lib} with {arg} +; libcallnr( {lib}, {func}, {arg}) Number idem, but return a Number + +(def-vim-function "line" (expr) (t) result-number-or-nil + "line nr of cursor, last line, or mark") +(defun num-lines () (1+ (vim:line "$"))) + +; line2byte( {lnum}) Number byte count of line {lnum} + +(def-vim-function "lispindent" (lnum) (string-or-number) 1- + "Lisp indent for line {lnum}") + +; localtime() Number current time +; maparg( {name}[, {mode}]) String rhs of mapping {name} in mode {mode} +; mapcheck( {name}[, {mode}]) String check for mappings matching {name} +; match( {expr}, {pat}[, {start}]) +; Number position where {pat} matches in {expr} +; matchend( {expr}, {pat}[, {start}]) +; Number position where {pat} ends in {expr} +; matchstr( {expr}, {pat}[, {start}]) +; String match of {pat} in {expr} +; mode() String current editing mode +; nextnonblank( {lnum}) Number line nr of non-blank line >= {lnum} +; nr2char( {expr}) String single char with ASCII value {expr} +; prevnonblank( {lnum}) Number line nr of non-blank line <= {lnum} +; remote_expr( {server}, {string} [, {idvar}]) +; String send expression +; remote_foreground( {server}) Number bring Vim server to the foreground +; remote_peek( {serverid} [, {retvar}]) +; Number check for reply string +; remote_read( {serverid}) String read reply string +; remote_send( {server}, {string} [, {idvar}]) +; String send key sequence +; rename( {from}, {to}) Number rename (move) file from {from} to {to} +; resolve( {filename}) String get filename a shortcut points to +; search( {pattern} [, {flags}]) Number search for {pattern} +; searchpair( {start}, {middle}, {end} [, {flags} [, {skip}]]) +; Number search for other end of start/end pair +; server2client( {clientid}, {string}) +; Number send reply string +; serverlist() String get a list of available servers +; setbufvar( {expr}, {varname}, {val}) set {varname} in buffer {expr} to {val} +; setcmdpos( {pos}) Number set cursor position in command-line + +(def-vim-function "setline" (lnum line) (string-or-number t) zerop + "set line {lnum} to {line}") + +; setreg( {n}, {v}[, {opt}]) Number set register to value and type +; setwinvar( {nr}, {varname}, {val}) set {varname} in window {nr} to {val} +; simplify( {filename}) String simplify filename as much as possible +; strftime( {format}[, {time}]) String time in specified format +; stridx( {haystack}, {needle}) Number first index of {needle} in {haystack} +; strlen( {expr}) Number length of the String {expr} +; strpart( {src}, {start}[, {len}]) +; String {len} characters of {src} at {start} +; strridx( {haystack}, {needle}) Number last index of {needle} in {haystack} +; strtrans( {expr}) String translate string to make it printable +; submatch( {nr}) String specific match in ":substitute" +; substitute( {expr}, {pat}, {sub}, {flags}) +; String all {pat} in {expr} replaced with {sub} +; synID( {line}, {col}, {trans}) Number syntax ID at {line} and {col} +; synIDattr( {synID}, {what} [, {mode}]) +; String attribute {what} of syntax ID {synID} +; synIDtrans( {synID}) Number translated syntax ID of {synID} +; system( {expr}) String output of shell command {expr} +; tempname() String name for a temporary file +; tolower( {expr}) String the String {expr} switched to lowercase +; toupper( {expr}) String the String {expr} switched to uppercase +; type( {name}) Number type of variable {name} + +(def-vim-function "virtcol" (expr) (t) result-number-or-nil + "screen column of cursor or mark") + +; visualmode( [expr]) String last visual mode used + +(def-vim-function "winbufnr" (nr) (nil-or-number) result-number-or-nil + "buffer number of window {nr}") +(def-vim-function "wincol" () () 1- + "window column of the cursor") +(def-vim-function "winheight" (nr) (nil-or-number) result-number-or-nil + "height of window {nr}") +(def-vim-function "winline" () () 1- + "window line of the cursor") +(def-vim-function "winnr" () () 1- + "number of current window") + +; winrestcmd() String returns command to restore window sizes + +(def-vim-function "winwidth" (nr) (nil-or-number) result-number-or-nil + "width of window {nr}") + +;;; ###################################################################### +;;; Various utility functions +;;; ###################################################################### +(defgeneric change-to-buffer (n) + (:documentation "Changes to the given buffer. Hides the current buffer.")) +(defmethod change-to-buffer ((name string)) + (vim:cmd "silent hide buffer " name)) +(defmethod change-to-buffer ((number number)) + (change-to-buffer (vim:bufname number))) +(defmacro with-buffer (expr &body body) + `(let ((current-buffer (vim:bufname "%"))) + (unwind-protect + (progn + (change-to-buffer ,expr) + ,@body) + (change-to-buffer current-buffer)))) + +(defgeneric setq (var val)) +(defmethod setq ((var string) (val string)) + (vim:cmd (format nil "let ~A = ~S" var val))) +(defmethod setq ((var string) val) + (vim:setq var (prin1-to-string val))) + +(defun var (var) + (let* ((s-val (vim:expr var)) + (length (length s-val))) + (multiple-value-bind (n-val pos) (parse-integer s-val :junk-allowed t) + (if (and n-val (= length pos)) + n-val + s-val)))) +(defun var-n (var) + (parse-integer (vim:expr var))) +(defun var-s (var) + (vim:expr var)) + +(defclass point () + ((bufnr :initarg :bufnr :accessor bufnr-of) + (line :initarg :line :accessor line-of) + (col :initarg :col :accessor col-of) + (virtcol :initarg :virtcol :accessor virtcol-of) + (winline :initarg :winline :accessor winline-of))) + +(defun get-pos (&optional (where ".")) + (if (vim:line where) + (make-instance 'point + :bufnr (vim:bufnr "%") + :line (vim:line where) + :col (vim:col where) + :virtcol (vim:virtcol where) + :winline (if (string= where ".") (vim:winline) nil)) + nil)) + +(defmacro get-pos-after (&body body) + `(progn ,@body (get-pos))) + +(defun scroll-window (n) + "Negative means scroll the window down, i.e. scroll the text up, using . + Positive means scroll the window up, i.e. scroll the text down, using ." + (cond ((< n 0) (vim:execute (format nil "normal ~D\\" (- n)))) + ((> n 0) (vim:execute (format nil "normal ~D\\" n))))) + +(defun position-window (want) + "Scroll the window such that the current line of text is at the given window line. + The top line is line 0. If WANT is NIL, positions the current line in the + middle of the screen." + (if want + (scroll-window (- want (vim:winline))) + (position-window (truncate vim:winline 2)))) + +(defgeneric goto-pos (where)) +(defmethod goto-pos (where) nil) +(defmethod goto-pos ((where point)) + (with-slots (bufnr line col virtcol winline) where + (when (/= bufnr (vim:bufnr "%")) + (change-to-buffer bufnr)) + (vim:cursor line virtcol) + (position-window winline))) + +(defun append-text-to-buffer (line) + (vim:setline "$" (concatenate 'string (vim:getline "$") line))) + +(defun multi-line-map (f text) + (loop for start = 0 then (1+ end) + for end = (position #\Newline text :start start) + for line = (subseq text start end) + do (cl:funcall f start end line) + while end)) + +(defun append-multi-line-string (text) + (vim:multi-line-map + (lambda (start end line) + (if (= start 0) + (vim:append-text-to-buffer line) + (vim:append (vim:line "$") line))) + text)) + +(defmacro with-options (bindings &body body) + "Set new values to existing Vim options; restores old values at exit. + Works with Vim variables, too, as long as they already exist." + (loop for (var val) in bindings + for old-var = (gensym) + collect `(,old-var (vim:var ,var)) into let-bindings + collect `(vim:setq ,var ,val) into setup + collect `(vim:setq ,var ,old-var) into teardown + finally (return `(let ,let-bindings + ,@setup + (unwind-protect + (progn ,@body) + ,@teardown))))) + +(defun normal (str &rest rest) + (when rest + (setf str (apply #'concatenate 'string str rest))) + (cmd "normal " str)) + diff -ur --unidirectional-new-file vim70/runtime/if_ecl.vim vim+async+ecl-70/runtime/if_ecl.vim --- vim70/runtime/if_ecl.vim 1969-12-31 19:00:00.000000000 -0500 +++ vim+async+ecl-70/runtime/if_ecl.vim 2006-06-08 06:27:09.000000000 -0400 @@ -0,0 +1,5 @@ +" Setup ECL in vim +" +" Written by Eirik A. Nygaard + +silent exec "ecl (load \"" . $VIMRUNTIME . "/if_ecl.lisp\")" diff -ur --unidirectional-new-file vim70/src/Makefile vim+async+ecl-70/src/Makefile --- vim70/src/Makefile 2006-05-07 09:25:27.000000000 -0400 +++ vim+async+ecl-70/src/Makefile 2006-06-08 08:51:50.000000000 -0400 @@ -20,7 +20,7 @@ # system, compiler or preferences. Uncommenting means that the '#' in # the first column of a line is removed. # - If you want a version of Vim that is small and starts up quickly, -# you might want to disable the GUI, X11, Perl, Python and Tcl. +# you might want to disable the GUI, X11, Perl, ECL, Python and Tcl. # - Uncomment the line with --disable-gui if you have Motif, GTK and/or # Athena but don't want to make gvim (the GUI version of Vim with nice # menus and scrollbars, but makes Vim bigger and startup slower). @@ -40,6 +40,7 @@ # each makes Vim quite a bit bigger: # --enable-perlinterp for Perl interpreter # --enable-pythoninterp for Python interpreter +# --enable-eclinterp for ECL compiler # --enable-rubyinterp for Ruby interpreter # --enable-tclinterp for Tcl interpreter # --enable-cscope for Cscope interface @@ -374,6 +375,10 @@ # This requires at least "small" features, "tiny" doesn't work. #CONF_OPT_PERL = --enable-perlinterp +# ECL - For creating Vim with ECL interface +# Uncomment this when you want to include the ECL interface. +#CONF_OPT_ECL = --enable-eclinterp + # PYTHON # Uncomment this when you want to include the Python interface. # NOTE: This may cause threading to be enabled, which has side effects (such @@ -985,6 +990,12 @@ ### Name of the option window script file target. SYS_OPTWIN_FILE = $(DESTDIR)$(SCRIPTLOC)/optwin.vim +### Name of the ecl lisp file. +SYS_IF_ECL_FILE = $(DESTDIR)$(SCRIPTLOC)/if_ecl.lisp + +### Name of the ecl vim file. +SYS_IF_ECL_VIM_FILE = $(DESTDIR)$(SCRIPTLOC)/if_ecl.vim + # Program to install the program in the target directory. Could also be "mv". INSTALL_PROG = cp @@ -1270,7 +1281,7 @@ .SUFFIXES: .c .o .pro PRE_DEFS = -Iproto $(DEFS) $(GUI_DEFS) $(GUI_IPATH) $(CPPFLAGS) $(EXTRA_IPATHS) -POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(TCL_CFLAGS) $(RUBY_CFLAGS) $(EXTRA_DEFS) +POST_DEFS = $(X_CFLAGS) $(MZSCHEME_CFLAGS) $(PERL_CFLAGS) $(ECL_CFLAGS) $(PYTHON_CFLAGS) $(TCL_CFLAGS) $(RUBY_CFLAGS) $(EXTRA_DEFS) ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS) @@ -1287,7 +1298,7 @@ PFLAGS = $(PROTO_FLAGS) -DPROTO $(LINT_CFLAGS) ALL_LIB_DIRS = $(GUI_LIBS_DIR) $(X_LIBS_DIR) -ALL_LIBS = $(GUI_LIBS1) $(GUI_X_LIBS) $(GUI_LIBS2) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) $(LIBS) $(EXTRA_LIBS) $(MZSCHEME_LIBS) $(PERL_LIBS) $(PYTHON_LIBS) $(TCL_LIBS) $(RUBY_LIBS) $(PROFILE_LIBS) +ALL_LIBS = $(GUI_LIBS1) $(GUI_X_LIBS) $(GUI_LIBS2) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) $(LIBS) $(EXTRA_LIBS) $(MZSCHEME_LIBS) $(PERL_LIBS) $(PYTHON_LIBS) $(TCL_LIBS) $(RUBY_LIBS) $(PROFILE_LIBS) $(ECL_LIBS) # abbreviations DEST_BIN = $(DESTDIR)$(BINDIR) @@ -1368,6 +1379,7 @@ misc2.c \ move.c \ mbyte.c \ + network_io.c \ normal.c \ ops.c \ option.c \ @@ -1390,13 +1402,13 @@ SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) $(MZSCHEME_SRC) \ $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) $(RUBY_SRC) \ - $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) + $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) $(ECL_SRC) TAGS_SRC = *.c *.cpp if_perl.xs EXTRA_SRC = hangulin.c if_mzsch.c auto/if_perl.c if_perlsfio.c \ if_python.c if_tcl.c if_ruby.c if_sniff.c gui_beval.c \ - workshop.c wsdebug.c integration.c netbeans.c + workshop.c wsdebug.c integration.c netbeans.c if_ecl.c # All sources, also the ones that are not configured ALL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(EXTRA_SRC) @@ -1404,7 +1416,7 @@ # Which files to check with lint. Select one of these three lines. ALL_SRC # checks more, but may not work well for checking a GUI that wasn't configured. # The perl sources also don't work well with lint. -LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) $(PYTHON_SRC) $(TCL_SRC) \ +LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) $(ECL_SRC) $(PYTHON_SRC) $(TCL_SRC) \ $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) $(NETBEANS_SRC) #LINT_SRC = $(SRC) #LINT_SRC = $(ALL_SRC) @@ -1439,6 +1451,7 @@ objects/misc2.o \ objects/move.o \ objects/mbyte.o \ + objects/network_io.o \ objects/normal.o \ objects/ops.o \ objects/option.o \ @@ -1460,6 +1473,7 @@ $(GUI_OBJ) \ $(MZSCHEME_OBJ) \ $(PERL_OBJ) \ + $(ECL_OBJ) \ $(PYTHON_OBJ) \ $(TCL_OBJ) \ $(RUBY_OBJ) \ @@ -1489,6 +1503,7 @@ if_cscope.pro \ if_xcmdsrv.pro \ if_python.pro \ + if_ecl.pro \ if_ruby.pro \ main.pro \ mark.pro \ @@ -1555,7 +1570,8 @@ $(CONF_OPT_OUTPUT) $(CONF_OPT_GPM) $(CONF_OPT_WORKSHOP) \ $(CONF_OPT_SNIFF) $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \ $(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \ - $(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) + $(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \ + $(CONF_OPT_ECL) # Use "make reconfig" to rerun configure without cached values. # When config.h changes, most things will be recompiled automatically. @@ -1819,6 +1835,8 @@ chmod $(VIMSCRIPTMOD) $(SYS_INDOFF_FILE) $(INSTALL_DATA) $(SCRIPTSOURCE)/optwin.vim $(SYS_OPTWIN_FILE) chmod $(VIMSCRIPTMOD) $(SYS_OPTWIN_FILE) + $(INSTALL_DATA) $(SCRIPTSOURCE)/if_ecl.lisp $(SYS_IF_ECL_FILE) + $(INSTALL_DATA) $(SCRIPTSOURCE)/if_ecl.vim $(SYS_IF_ECL_VIM_FILE) # install the print resource files cd $(PRINTSOURCE); $(INSTALL_DATA) *.ps $(DEST_PRINT) cd $(DEST_PRINT); chmod $(FILEMOD) *.ps @@ -2396,6 +2414,9 @@ objects/if_perlsfio.o: if_perlsfio.c $(CCC) -o $@ if_perlsfio.c +objects/if_ecl.o: if_ecl.c + $(CCC) -o $@ if_ecl.c + objects/if_python.o: if_python.c $(CCC) -o $@ if_python.c @@ -2441,6 +2462,9 @@ objects/mbyte.o: mbyte.c $(CCC) -o $@ mbyte.c +objects/network_io.o: network_io.c + $(CCC) -o $@ network_io.c + objects/normal.o: normal.c $(CCC) -o $@ normal.c @@ -2611,209 +2635,196 @@ ### Dependencies: objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h version.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h version.h objects/charset.o: charset.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/diff.o: diff.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/digraph.o: digraph.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/edit.o: edit.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/eval.o: eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h version.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h version.h objects/ex_cmds.o: ex_cmds.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h version.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h version.h objects/ex_cmds2.o: ex_cmds2.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h version.h + globals.h version.h objects/ex_docmd.o: ex_docmd.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h objects/ex_eval.o: ex_eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/ex_getln.o: ex_getln.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/fold.o: fold.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/getchar.o: getchar.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/hardcopy.o: hardcopy.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h version.h + globals.h version.h objects/hashtab.o: hashtab.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/if_cscope.o: if_cscope.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h if_cscope.h + globals.h if_cscope.h objects/if_xcmdsrv.o: if_xcmdsrv.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h version.h + globals.h version.h objects/main.o: main.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h farsi.c arabic.c + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.c \ + arabic.c objects/mark.o: mark.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/memline.o: memline.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/menu.o: menu.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/message.o: message.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/misc1.o: misc1.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h version.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h version.h objects/misc2.o: misc2.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/move.o: move.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/mbyte.o: mbyte.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h +objects/network_io.o: network_io.c vim.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h network_io.h objects/normal.o: normal.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/ops.o: ops.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ - proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h + proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/option.o: option.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h os_unixx.h -objects/pathdef.o: auto/pathdef.c ./vim.h ./auto/config.h ./feature.h ./os_unix.h \ - ./auto/osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./option.h \ - ./structs.h ./regexp.h ./gui.h ./gui_beval.h proto/gui_beval.pro \ - ./ex_cmds.h ./proto.h ./globals.h ./farsi.h ./arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h os_unixx.h \ + network_io.h +objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \ + auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ + regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ + globals.h objects/popupmnu.o: popupmnu.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h objects/quickfix.o: quickfix.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h objects/regexp.o: regexp.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/screen.o: screen.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/search.o: search.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/spell.o: spell.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/tag.o: tag.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ - proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h + proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/term.o: term.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/ui.o: ui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ - proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h + proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/undo.o: undo.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/version.o: version.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h version.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h version.h objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ - proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h + proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h ../pixmaps/stock_icons.h + globals.h ../pixmaps/alert.xpm ../pixmaps/error.xpm \ + ../pixmaps/generic.xpm ../pixmaps/info.xpm ../pixmaps/quest.xpm \ + ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \ + ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm \ + ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ + ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ + ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ + ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ + ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \ + ../pixmaps/tb_save_all.xpm ../pixmaps/tb_jump.xpm \ + ../pixmaps/tb_ctags.xpm ../pixmaps/tb_load_session.xpm \ + ../pixmaps/tb_save_session.xpm ../pixmaps/tb_new_session.xpm \ + ../pixmaps/tb_blank.xpm ../pixmaps/tb_maximize.xpm \ + ../pixmaps/tb_split.xpm ../pixmaps/tb_minimize.xpm \ + ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \ + ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ + ../pixmaps/tb_minwidth.xpm ../pixmaps/stock_icons.h objects/gui_gtk_f.o: gui_gtk_f.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h gui_gtk_f.h + globals.h gui_gtk_f.h objects/gui_motif.o: gui_motif.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h gui_xmebw.h ../pixmaps/alert.xpm \ - ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \ - ../pixmaps/quest.xpm gui_x11_pm.h ../pixmaps/tb_new.xpm \ - ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \ - ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \ - ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ - ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ - ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ - ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ - ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \ + globals.h gui_xmebw.h ../pixmaps/alert.xpm ../pixmaps/error.xpm \ + ../pixmaps/generic.xpm ../pixmaps/info.xpm ../pixmaps/quest.xpm \ + gui_x11_pm.h ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm \ + ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm \ + ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm \ + ../pixmaps/tb_find.xpm ../pixmaps/tb_find_next.xpm \ + ../pixmaps/tb_find_prev.xpm ../pixmaps/tb_find_help.xpm \ + ../pixmaps/tb_exit.xpm ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm \ + ../pixmaps/tb_help.xpm ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \ ../pixmaps/tb_save_all.xpm ../pixmaps/tb_jump.xpm \ ../pixmaps/tb_ctags.xpm ../pixmaps/tb_load_session.xpm \ ../pixmaps/tb_save_session.xpm ../pixmaps/tb_new_session.xpm \ @@ -2825,18 +2836,18 @@ objects/gui_xmdlg.o: gui_xmdlg.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h objects/gui_xmebw.o: gui_xmebw.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h gui_xmebwp.h gui_xmebw.h + globals.h gui_xmebwp.h gui_xmebw.h objects/gui_athena.o: gui_athena.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h gui_at_sb.h gui_x11_pm.h \ - ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm \ - ../pixmaps/tb_save.xpm ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm \ - ../pixmaps/tb_copy.xpm ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ + globals.h gui_at_sb.h gui_x11_pm.h ../pixmaps/tb_new.xpm \ + ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \ + ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \ + ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ @@ -2852,70 +2863,59 @@ objects/gui_gtk_x11.o: gui_gtk_x11.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h gui_gtk_f.h ../runtime/vim32x32.xpm \ - ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm + globals.h gui_gtk_f.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ + ../runtime/vim48x48.xpm objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ - ../runtime/vim48x48.xpm + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h \ + ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm objects/gui_at_sb.o: gui_at_sb.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h gui_at_sb.h + globals.h gui_at_sb.h objects/gui_at_fs.o: gui_at_fs.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h gui_at_sb.h + globals.h gui_at_sb.h objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \ - proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h + proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h objects/if_mzsch.o: if_mzsch.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h if_mzsch.h -objects/if_perl.o: auto/if_perl.c ./vim.h ./auto/config.h ./feature.h ./os_unix.h \ - ./auto/osdef.h ./ascii.h ./keymap.h ./term.h ./macros.h ./option.h \ - ./structs.h ./regexp.h ./gui.h ./gui_beval.h proto/gui_beval.pro \ - ./ex_cmds.h ./proto.h ./globals.h ./farsi.h ./arabic.h + globals.h if_mzsch.h objects/if_perlsfio.o: if_perlsfio.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h objects/if_python.o: if_python.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h objects/if_tcl.o: if_tcl.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h objects/if_ruby.o: if_ruby.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \ - gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \ - arabic.h version.h -objects/if_sniff.o: if_sniff.c vim.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ - regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h os_unixx.h + gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h version.h objects/gui_beval.o: gui_beval.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h + globals.h objects/workshop.o: workshop.c auto/config.h integration.h vim.h feature.h \ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \ structs.h regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h \ - proto.h globals.h farsi.h arabic.h version.h workshop.h + proto.h globals.h version.h workshop.h objects/wsdebug.o: wsdebug.c objects/integration.o: integration.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h integration.h + globals.h integration.h objects/netbeans.o: netbeans.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \ - globals.h farsi.h arabic.h version.h + globals.h version.h diff -ur --unidirectional-new-file vim70/src/auto/configure vim+async+ecl-70/src/auto/configure --- vim70/src/auto/configure 2006-05-04 06:46:19.000000000 -0400 +++ vim+async+ecl-70/src/auto/configure 2006-06-08 08:13:52.000000000 -0400 @@ -1,8 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.59d. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -16,11 +17,35 @@ # Zsh 3.x and 4.x performs 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 + 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 + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +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 + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -29,8 +54,43 @@ 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.) +as_nl=' +' +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 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -44,18 +104,19 @@ 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 + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +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 @@ -63,157 +124,386 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -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 +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} - 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 +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi - ;; - 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 - '') +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /usr/bin/posix$PATH_SEPARATOR/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 + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells which exist, to save several forks. + if test -f $as_shell && + { ($as_shell) 2> /dev/null <<\_ASEOF +# 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 + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { $as_shell 2> /dev/null <<\_ASEOF +# 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 + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( 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 + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # 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. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, 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 | + # scripts with optimization help from Paolo Bonzini. 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 || + chmod +x "$as_me.lineno" || { 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 + # 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= ;; +if (dirname -- /) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi 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 + 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' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln 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=: @@ -222,7 +512,19 @@ as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # 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'" @@ -231,39 +533,27 @@ 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 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -300,17 +590,162 @@ #endif #if HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif +#endif +#if HAVE_STDINT_H +# include #endif #if HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AWK STRIP CPP_MM OS_EXTRA_SRC OS_EXTRA_OBJ VIMNAME EXNAME VIEWNAME line_break dovimdiff dogvimdiff compiledby vi_cv_path_mzscheme MZSCHEME_SRC MZSCHEME_OBJ MZSCHEME_PRO MZSCHEME_LIBS MZSCHEME_CFLAGS vi_cv_path_perl vi_cv_perllib shrpenv PERL_SRC PERL_OBJ PERL_PRO PERL_CFLAGS PERL_LIBS vi_cv_path_python PYTHON_CONFDIR PYTHON_LIBS PYTHON_GETPATH_CFLAGS PYTHON_CFLAGS PYTHON_SRC PYTHON_OBJ vi_cv_path_tcl TCL_SRC TCL_OBJ TCL_PRO TCL_CFLAGS TCL_LIBS vi_cv_path_ruby RUBY_SRC RUBY_OBJ RUBY_PRO RUBY_CFLAGS RUBY_LIBS WORKSHOP_SRC WORKSHOP_OBJ NETBEANS_SRC NETBEANS_OBJ SNIFF_SRC SNIFF_OBJ xmkmfpath X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_LIB GTK_CONFIG GTK12_CONFIG PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_LIBNAME GNOME_LIBS GNOME_LIBDIR GNOME_INCLUDEDIR GNOME_CONFIG MOTIF_LIBNAME NARROW_PROTO GUI_INC_LOC GUI_LIB_LOC GUITYPE GUI_X_LIBS HANGULIN_SRC HANGULIN_OBJ TAGPRG INSTALL_LANGS INSTALL_TOOL_LANGS MSGFMT MAKEMO DEPEND_CFLAGS_FILTER LIBOBJS LTLIBOBJS' +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 +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +SET_MAKE +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +CPP +GREP +EGREP +AWK +STRIP +CPP_MM +OS_EXTRA_SRC +OS_EXTRA_OBJ +VIMNAME +EXNAME +VIEWNAME +line_break +dovimdiff +dogvimdiff +compiledby +vi_cv_path_mzscheme +MZSCHEME_SRC +MZSCHEME_OBJ +MZSCHEME_PRO +MZSCHEME_LIBS +MZSCHEME_CFLAGS +vi_cv_path_perl +vi_cv_perllib +shrpenv +PERL_SRC +PERL_OBJ +PERL_PRO +PERL_CFLAGS +PERL_LIBS +vi_cv_path_ecl_config +ECL_LIBS +ECL_CFLAGS +ECL_SRC +ECL_OBJ +vi_cv_path_python +PYTHON_CONFDIR +PYTHON_LIBS +PYTHON_GETPATH_CFLAGS +PYTHON_CFLAGS +PYTHON_SRC +PYTHON_OBJ +vi_cv_path_tcl +TCL_SRC +TCL_OBJ +TCL_PRO +TCL_CFLAGS +TCL_LIBS +vi_cv_path_ruby +RUBY_SRC +RUBY_OBJ +RUBY_PRO +RUBY_CFLAGS +RUBY_LIBS +WORKSHOP_SRC +WORKSHOP_OBJ +NETBEANS_SRC +NETBEANS_OBJ +SNIFF_SRC +SNIFF_OBJ +xmkmfpath +XMKMF +X_CFLAGS +X_PRE_LIBS +X_LIBS +X_EXTRA_LIBS +X_LIB +GTK_CONFIG +GTK12_CONFIG +PKG_CONFIG +GTK_CFLAGS +GTK_LIBS +GTK_LIBNAME +GNOME_LIBS +GNOME_LIBDIR +GNOME_INCLUDEDIR +GNOME_CONFIG +MOTIF_LIBNAME +NARROW_PROTO +GUI_INC_LOC +GUI_LIB_LOC +GUITYPE +GUI_X_LIBS +HANGULIN_SRC +HANGULIN_OBJ +TAGPRG +INSTALL_LANGS +INSTALL_TOOL_LANGS +MSGFMT +MAKEMO +DEPEND_CFLAGS_FILTER +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +CPPFLAGS +CPP +XMKMF' + # Initialize some variables set by options. ac_init_help= @@ -337,34 +772,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}' +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 ;; @@ -386,12 +835,18 @@ --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-\(.*\)'` # Reject names that are not valid shell variable names. @@ -399,7 +854,17 @@ { 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" ;; + eval enable_$ac_feature=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-\([^=]*\)'` @@ -408,11 +873,7 @@ { 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'" ;; + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -439,6 +900,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 ;; @@ -463,13 +930,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) @@ -534,6 +1004,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 ;; @@ -590,11 +1070,7 @@ { 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'" ;; + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` @@ -603,7 +1079,7 @@ { 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" ;; + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -634,8 +1110,7 @@ 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'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -655,27 +1130,19 @@ { (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` - 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 +# Be sure to have absolute directory names. +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=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -702,74 +1169,76 @@ 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 .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # 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 || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + 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'` + 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 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { 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 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&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_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 + 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. @@ -798,9 +1267,6 @@ -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] @@ -818,15 +1284,22 @@ --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] + --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/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -849,6 +1322,7 @@ --disable-xsmp-interact Disable XSMP interaction --enable-mzschemeinterp Include MzScheme interpreter. --enable-perlinterp Include Perl interpreter. + --enable-eclinterp Include ECL compiler. --enable-pythoninterp Include Python interpreter. --enable-tclinterp Include Tcl interpreter. --enable-rubyinterp Include Ruby interpreter. @@ -901,126 +1375,95 @@ CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor + XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _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 ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) 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 + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`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 ;; + 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 -# 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. + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. if test -f $ac_srcdir/configure.gnu; then - echo + echo && $SHELL $ac_srcdir/configure.gnu --help=recursive elif test -f $ac_srcdir/configure; then - echo + 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 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.59d -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>auto/config.log -cat >&5 <<_ACEOF +cat >auto/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 $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.59d. Invocation command line was $ $0 $@ _ACEOF +exec 5>>auto/config.log { cat <<_ASUNAME ## --------- ## @@ -1039,7 +1482,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` @@ -1053,6 +1496,7 @@ test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1085,7 +1529,7 @@ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1120,8 +1564,8 @@ # 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. { @@ -1134,20 +1578,34 @@ _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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_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" - ;; + "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" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1158,22 +1616,22 @@ 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 + 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 + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1185,26 +1643,24 @@ ## ----------- ## _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" } >&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 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 # Predefined preprocessor variables. @@ -1235,14 +1691,17 @@ # 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 +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +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;} @@ -1271,12 +1730,11 @@ # 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 @@ -1301,8 +1759,7 @@ # 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1319,12 +1776,6 @@ { (exit 1); exit 1; }; } 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 - @@ -1341,28 +1792,34 @@ +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 - ac_config_headers="$ac_config_headers auto/config.h:config.h.in" +ac_config_headers="$ac_config_headers auto/config.h:config.h.in" cat >>confdefs.h <<\_ACEOF #define UNIX 1 _ACEOF -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 +{ 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 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo 'ac_maketemp=X"$(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 +if test "$ac_maketemp" != X ; then eval ac_cv_prog_make_${ac_make}_set=yes else eval ac_cv_prog_make_${ac_make}_set=no @@ -1370,12 +1827,12 @@ 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 + { 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 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -1388,8 +1845,8 @@ 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 +{ 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 @@ -1402,32 +1859,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $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 +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 + { 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 + { 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 +{ 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 @@ -1440,36 +1899,51 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $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 +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 + { 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 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&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 +{ 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 @@ -1482,74 +1956,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $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 +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 + { 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 + { 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 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 +{ 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 @@ -1563,7 +1997,7 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $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 @@ -1574,6 +2008,7 @@ 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. @@ -1591,22 +2026,23 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { 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 + { 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 + 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 +{ 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 @@ -1619,36 +2055,38 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $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 +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 + { 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 + { 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 + 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 +{ 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 @@ -1661,29 +2099,45 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $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 +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 + { 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 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -1696,25 +2150,38 @@ { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5 + (eval $ac_compiler --version >&5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5 + (eval $ac_compiler -v >&5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5 + (eval $ac_compiler -V >&5) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } + +# List of possible output files. We want to start from the most likely, +# but we have to check foo.exe before foo, because Cygwin `test -f' looks +# also for foo.exe. b.out is created by i960 compilers. +# As a last resort, we also try wildcards: `conftest.*' and `a.*'. +# But we are not allowed to rm a.*, and we do not want always remove +# conftest.*, so we will list them literally, when appropriate. +ac_outfiles="a_out.exe a.out conftest.exe conftest a.exe b.out" + +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +rm -f $ac_outfiles conftest.* + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -1730,51 +2197,40 @@ return 0; } _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 $ac_outfiles" + +# The following tests should remove their output except files matching conftest.*. # 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 +{ 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 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 + for ac_file in $ac_outfiles a.* conftest.* NO 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. - ;; - [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 - break;; - * ) - break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) break;; esac done +if test "$ac_file" = NO; then + { { echo "$as_me:$LINENO: error: no output file found +See \`config.log' for more details." >&5 +echo "$as_me: error: no output file found +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -1786,14 +2242,12 @@ { (exit 77); exit 77; }; } fi -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 +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +# Check that 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 +{ 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 @@ -1818,83 +2272,84 @@ fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ 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 +# Clean up; list also $ac_file, in case it matched a wildcard entry. +rm -f $ac_outfiles $ac_file -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 +{ 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 test "${ac_cv_exeext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + 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 - # 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 -# `rm'. -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_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done + # 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 `rm'. + for ac_file in conftest.exe conftest conftest.* NO; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac + done + if test "$ac_file" = NO; then + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: no output file found +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: no output file found +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + + # Clean up; list also $ac_file, in case it matched conftest.*. + rm -f $ac_outfiles $ac_file + 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 -rm -f conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } 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 + + +ac_clean_files=$ac_clean_files_save + +{ 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 -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj + rm -f conftest.o conftest.obj 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 - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + 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 ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -1910,14 +2365,16 @@ { (exit 1); exit 1; }; } 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 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$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 + + +rm -f conftest.* +{ 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 @@ -1948,8 +2405,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -1966,24 +2422,113 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + 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 +{ 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 +{ 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 + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + 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 + + CFLAGS="" + 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 + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2007,8 +2552,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2025,12 +2569,20 @@ 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 + 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 + +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +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 @@ -2046,12 +2598,12 @@ 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 "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -2085,10 +2637,10 @@ /* 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]; int test (int i, double x); @@ -2105,14 +2657,8 @@ 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 @@ -2124,8 +2670,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2137,173 +2682,36 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi + rm -f conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +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) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}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" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2314,8 +2722,8 @@ 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 +{ 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; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2375,9 +2783,10 @@ # 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. */ @@ -2415,6 +2824,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -2432,8 +2842,8 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -2482,9 +2892,10 @@ # 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. */ @@ -2522,6 +2933,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -2544,19 +2956,166 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -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 "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + 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_executable_p "$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 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + 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 + ac_count=`expr $ac_count + 1` + 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.*;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_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_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_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' + 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_executable_p "$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 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + 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 + ac_count=`expr $ac_count + 1` + 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.*;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + 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 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" cat >conftest.$ac_ext <<_ACEOF @@ -2567,18 +3126,13 @@ /* end confdefs.h. */ _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "" >/dev/null 2>&1; then - : -fi rm -f conftest* - echo "$as_me:$LINENO: checking for library containing strerror" >&5 -echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing strerror" >&5 +echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } if test "${ac_cv_search_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_strerror=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -2586,77 +3140,29 @@ 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 +/* 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. */ -char strerror (); -int -main () -{ -strerror (); - ; - 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_search_strerror="none required" -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 "$ac_cv_search_strerror" = no; then - for ac_lib in cposix; do - LIBS="-l$ac_lib $ac_func_search_save_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 strerror (); int main () { -strerror (); +return strerror (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' cposix; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + 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=$? @@ -2665,8 +3171,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2678,31 +3183,41 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_strerror="-l$ac_lib" -break + ac_cv_search_strerror=$ac_res 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 - done + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then + break +fi +done +if test "${ac_cv_search_strerror+set}" = set; then + : +else + ac_cv_search_strerror=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -echo "${ECHO_T}$ac_cv_search_strerror" >&6 -if test "$ac_cv_search_strerror" != no; then - test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +echo "${ECHO_T}$ac_cv_search_strerror" >&6; } +ac_res=$ac_cv_search_strerror +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" 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 +{ 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 @@ -2715,32 +3230,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $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 +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { 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 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$AWK" && break done # 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 +{ 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 @@ -2753,29 +3270,31 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":" fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { 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 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test -z "$CFLAGS"; then CFLAGS="-O" test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall" @@ -2814,76 +3333,76 @@ OS_EXTRA_SRC=""; OS_EXTRA_OBJ="" -echo "$as_me:$LINENO: checking for BeOS" >&5 -echo $ECHO_N "checking for BeOS... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BeOS" >&5 +echo $ECHO_N "checking for BeOS... $ECHO_C" >&6; } case `uname` in BeOS) OS_EXTRA_SRC=os_beos.c; OS_EXTRA_OBJ=objects/os_beos.o - BEOS=yes; echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6;; - *) BEOS=no; echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6;; + BEOS=yes; { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; };; + *) BEOS=no; { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; };; esac -echo "$as_me:$LINENO: checking for QNX" >&5 -echo $ECHO_N "checking for QNX... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for QNX" >&5 +echo $ECHO_N "checking for QNX... $ECHO_C" >&6; } case `uname` in QNX) OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o test -z "$with_x" && with_x=no - QNX=yes; echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6;; - *) QNX=no; echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6;; + QNX=yes; { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; };; + *) QNX=no; { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; };; esac -echo "$as_me:$LINENO: checking for Darwin (Mac OS X)" >&5 -echo $ECHO_N "checking for Darwin (Mac OS X)... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for Darwin (Mac OS X)" >&5 +echo $ECHO_N "checking for Darwin (Mac OS X)... $ECHO_C" >&6; } if test "`(uname) 2>/dev/null`" = Darwin; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } - echo "$as_me:$LINENO: checking --disable-darwin argument" >&5 -echo $ECHO_N "checking --disable-darwin argument... $ECHO_C" >&6 - # Check whether --enable-darwin or --disable-darwin was given. + { echo "$as_me:$LINENO: checking --disable-darwin argument" >&5 +echo $ECHO_N "checking --disable-darwin argument... $ECHO_C" >&6; } + # Check whether --enable-darwin was given. if test "${enable_darwin+set}" = set; then - enableval="$enable_darwin" - + enableval=$enable_darwin; else enable_darwin="yes" -fi; +fi + if test "$enable_darwin" = "yes"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - echo "$as_me:$LINENO: checking if Darwin files are there" >&5 -echo $ECHO_N "checking if Darwin files are there... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking if Darwin files are there" >&5 +echo $ECHO_N "checking if Darwin files are there... $ECHO_C" >&6; } if test -f os_macosx.c; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, Darwin support disabled" >&5 -echo "${ECHO_T}no, Darwin support disabled" >&6 + { echo "$as_me:$LINENO: result: no, Darwin support disabled" >&5 +echo "${ECHO_T}no, Darwin support disabled" >&6; } enable_darwin=no fi else - echo "$as_me:$LINENO: result: yes, Darwin support excluded" >&5 -echo "${ECHO_T}yes, Darwin support excluded" >&6 + { echo "$as_me:$LINENO: result: yes, Darwin support excluded" >&5 +echo "${ECHO_T}yes, Darwin support excluded" >&6; } fi - echo "$as_me:$LINENO: checking --with-mac-arch argument" >&5 -echo $ECHO_N "checking --with-mac-arch argument... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking --with-mac-arch argument" >&5 +echo $ECHO_N "checking --with-mac-arch argument... $ECHO_C" >&6; } -# Check whether --with-mac-arch or --without-mac-arch was given. +# Check whether --with-mac-arch was given. if test "${with_mac_arch+set}" = set; then - withval="$with_mac_arch" - MACARCH="$withval"; echo "$as_me:$LINENO: result: $MACARCH" >&5 -echo "${ECHO_T}$MACARCH" >&6 -else - MACARCH="current"; echo "$as_me:$LINENO: result: defaulting to $MACARCH" >&5 -echo "${ECHO_T}defaulting to $MACARCH" >&6 -fi; + withval=$with_mac_arch; MACARCH="$withval"; { echo "$as_me:$LINENO: result: $MACARCH" >&5 +echo "${ECHO_T}$MACARCH" >&6; } +else + MACARCH="current"; { echo "$as_me:$LINENO: result: defaulting to $MACARCH" >&5 +echo "${ECHO_T}defaulting to $MACARCH" >&6; } +fi + if test "x$MACARCH" = "xboth"; then - echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5 -echo $ECHO_N "checking for 10.4 universal SDK... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5 +echo $ECHO_N "checking for 10.4 universal SDK... $ECHO_C" >&6; } save_cppflags="$CPPFLAGS" save_cflags="$CFLAGS" save_ldflags="$LDFLAGS" @@ -2912,8 +3431,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2925,17 +3443,17 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } CFLAGS="$save_cflags" - echo "$as_me:$LINENO: checking if Intel architecture is supported" >&5 -echo $ECHO_N "checking if Intel architecture is supported... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if Intel architecture is supported" >&5 +echo $ECHO_N "checking if Intel architecture is supported... $ECHO_C" >&6; } CPPFLAGS="$CPPFLAGS -arch i386" LDFLAGS="$save_ldflags -arch i386" cat >conftest.$ac_ext <<_ACEOF @@ -2962,8 +3480,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2975,21 +3492,23 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; MACARCH="intel" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; MACARCH="intel" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } MACARCH="ppc" CPPFLAGS="$save_cppflags -arch ppc" LDFLAGS="$save_ldflags -arch ppc" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext elif test "x$MACARCH" = "xintel"; then @@ -3011,8 +3530,8 @@ CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon" fi - echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + { 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 @@ -3044,8 +3563,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3062,8 +3580,9 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then @@ -3120,6 +3639,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -3139,8 +3659,8 @@ for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext @@ -3163,12 +3683,14 @@ ( 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 +rm -f core *.core core.conftest.* 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 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -3191,9 +3713,9 @@ 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 "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -3215,8 +3737,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3233,12 +3754,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + 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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -3250,17 +3773,17 @@ if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then - echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5 -echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5 +echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; } if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5 -echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5 +echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5 -echo $ECHO_N "checking Carbon/Carbon.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5 +echo $ECHO_N "checking Carbon/Carbon.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -3279,8 +3802,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3297,15 +3819,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 Carbon/Carbon.h presence" >&5 -echo $ECHO_N "checking Carbon/Carbon.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5 +echo $ECHO_N "checking Carbon/Carbon.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -3339,9 +3862,10 @@ 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 +{ 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 @@ -3365,25 +3889,18 @@ echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5 -echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5 +echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; } if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_Carbon_Carbon_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5 -echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5 +echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; } fi if test $ac_cv_header_Carbon_Carbon_h = yes; then @@ -3403,8 +3920,8 @@ fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -3431,80 +3948,80 @@ fi fi -echo "$as_me:$LINENO: checking --with-vim-name argument" >&5 -echo $ECHO_N "checking --with-vim-name argument... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking --with-vim-name argument" >&5 +echo $ECHO_N "checking --with-vim-name argument... $ECHO_C" >&6; } -# Check whether --with-vim-name or --without-vim-name was given. +# Check whether --with-vim-name was given. if test "${with_vim_name+set}" = set; then - withval="$with_vim_name" - VIMNAME="$withval"; echo "$as_me:$LINENO: result: $VIMNAME" >&5 -echo "${ECHO_T}$VIMNAME" >&6 -else - VIMNAME="vim"; echo "$as_me:$LINENO: result: Defaulting to $VIMNAME" >&5 -echo "${ECHO_T}Defaulting to $VIMNAME" >&6 -fi; + withval=$with_vim_name; VIMNAME="$withval"; { echo "$as_me:$LINENO: result: $VIMNAME" >&5 +echo "${ECHO_T}$VIMNAME" >&6; } +else + VIMNAME="vim"; { echo "$as_me:$LINENO: result: Defaulting to $VIMNAME" >&5 +echo "${ECHO_T}Defaulting to $VIMNAME" >&6; } +fi + -echo "$as_me:$LINENO: checking --with-ex-name argument" >&5 -echo $ECHO_N "checking --with-ex-name argument... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking --with-ex-name argument" >&5 +echo $ECHO_N "checking --with-ex-name argument... $ECHO_C" >&6; } -# Check whether --with-ex-name or --without-ex-name was given. +# Check whether --with-ex-name was given. if test "${with_ex_name+set}" = set; then - withval="$with_ex_name" - EXNAME="$withval"; echo "$as_me:$LINENO: result: $EXNAME" >&5 -echo "${ECHO_T}$EXNAME" >&6 -else - EXNAME="ex"; echo "$as_me:$LINENO: result: Defaulting to ex" >&5 -echo "${ECHO_T}Defaulting to ex" >&6 -fi; + withval=$with_ex_name; EXNAME="$withval"; { echo "$as_me:$LINENO: result: $EXNAME" >&5 +echo "${ECHO_T}$EXNAME" >&6; } +else + EXNAME="ex"; { echo "$as_me:$LINENO: result: Defaulting to ex" >&5 +echo "${ECHO_T}Defaulting to ex" >&6; } +fi -echo "$as_me:$LINENO: checking --with-view-name argument" >&5 -echo $ECHO_N "checking --with-view-name argument... $ECHO_C" >&6 -# Check whether --with-view-name or --without-view-name was given. +{ echo "$as_me:$LINENO: checking --with-view-name argument" >&5 +echo $ECHO_N "checking --with-view-name argument... $ECHO_C" >&6; } + +# Check whether --with-view-name was given. if test "${with_view_name+set}" = set; then - withval="$with_view_name" - VIEWNAME="$withval"; echo "$as_me:$LINENO: result: $VIEWNAME" >&5 -echo "${ECHO_T}$VIEWNAME" >&6 + withval=$with_view_name; VIEWNAME="$withval"; { echo "$as_me:$LINENO: result: $VIEWNAME" >&5 +echo "${ECHO_T}$VIEWNAME" >&6; } else - VIEWNAME="view"; echo "$as_me:$LINENO: result: Defaulting to view" >&5 -echo "${ECHO_T}Defaulting to view" >&6 -fi; + VIEWNAME="view"; { echo "$as_me:$LINENO: result: Defaulting to view" >&5 +echo "${ECHO_T}Defaulting to view" >&6; } +fi -echo "$as_me:$LINENO: checking --with-global-runtime argument" >&5 -echo $ECHO_N "checking --with-global-runtime argument... $ECHO_C" >&6 -# Check whether --with-global-runtime or --without-global-runtime was given. +{ echo "$as_me:$LINENO: checking --with-global-runtime argument" >&5 +echo $ECHO_N "checking --with-global-runtime argument... $ECHO_C" >&6; } + +# Check whether --with-global-runtime was given. if test "${with_global_runtime+set}" = set; then - withval="$with_global_runtime" - echo "$as_me:$LINENO: result: $withval" >&5 -echo "${ECHO_T}$withval" >&6; cat >>confdefs.h <<_ACEOF + withval=$with_global_runtime; { echo "$as_me:$LINENO: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6; }; cat >>confdefs.h <<_ACEOF #define RUNTIME_GLOBAL "$withval" _ACEOF 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; } +fi -echo "$as_me:$LINENO: checking --with-modified-by argument" >&5 -echo $ECHO_N "checking --with-modified-by argument... $ECHO_C" >&6 -# Check whether --with-modified-by or --without-modified-by was given. +{ echo "$as_me:$LINENO: checking --with-modified-by argument" >&5 +echo $ECHO_N "checking --with-modified-by argument... $ECHO_C" >&6; } + +# Check whether --with-modified-by was given. if test "${with_modified_by+set}" = set; then - withval="$with_modified_by" - echo "$as_me:$LINENO: result: $withval" >&5 -echo "${ECHO_T}$withval" >&6; cat >>confdefs.h <<_ACEOF + withval=$with_modified_by; { echo "$as_me:$LINENO: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6; }; cat >>confdefs.h <<_ACEOF #define MODIFIED_BY "$withval" _ACEOF 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; } +fi -echo "$as_me:$LINENO: checking if character set is EBCDIC" >&5 -echo $ECHO_N "checking if character set is EBCDIC... $ECHO_C" >&6 + +{ echo "$as_me:$LINENO: checking if character set is EBCDIC" >&5 +echo $ECHO_N "checking if character set is EBCDIC... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -3535,8 +4052,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3554,14 +4070,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # TryCompile action if false + # TryCompile action if false cf_cv_ebcdic=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # end of TryCompile ]) # end of CacheVal CvEbcdic -echo "$as_me:$LINENO: result: $cf_cv_ebcdic" >&5 -echo "${ECHO_T}$cf_cv_ebcdic" >&6 +{ echo "$as_me:$LINENO: result: $cf_cv_ebcdic" >&5 +echo "${ECHO_T}$cf_cv_ebcdic" >&6; } case "$cf_cv_ebcdic" in #(vi yes) cat >>confdefs.h <<\_ACEOF #define EBCDIC 1 @@ -3574,8 +4091,8 @@ if test "$cf_cv_ebcdic" = "yes"; then -echo "$as_me:$LINENO: checking for OS/390 Unix" >&5 -echo $ECHO_N "checking for OS/390 Unix... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for OS/390 Unix" >&5 +echo $ECHO_N "checking for OS/390 Unix... $ECHO_C" >&6; } case `uname` in OS/390) OS390Unix="yes"; if test "$CC" = "cc"; then @@ -3601,30 +4118,30 @@ exit 1 fi CFLAGS="$CFLAGS -D_ALL_SOURCE"; LDFLAGS="$LDFLAGS -Wl,EDIT=NO" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } ;; *) OS390Unix="no"; - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi -echo "$as_me:$LINENO: checking --with-features argument" >&5 -echo $ECHO_N "checking --with-features argument... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking --with-features argument" >&5 +echo $ECHO_N "checking --with-features argument... $ECHO_C" >&6; } -# Check whether --with-features or --without-features was given. +# Check whether --with-features was given. if test "${with_features+set}" = set; then - withval="$with_features" - features="$withval"; echo "$as_me:$LINENO: result: $features" >&5 -echo "${ECHO_T}$features" >&6 -else - features="normal"; echo "$as_me:$LINENO: result: Defaulting to normal" >&5 -echo "${ECHO_T}Defaulting to normal" >&6 -fi; + withval=$with_features; features="$withval"; { echo "$as_me:$LINENO: result: $features" >&5 +echo "${ECHO_T}$features" >&6; } +else + features="normal"; { echo "$as_me:$LINENO: result: Defaulting to normal" >&5 +echo "${ECHO_T}Defaulting to normal" >&6; } +fi + dovimdiff="" dogvimdiff="" @@ -3652,109 +4169,109 @@ _ACEOF dovimdiff="installvimdiff"; dogvimdiff="installgvimdiff" ;; - *) echo "$as_me:$LINENO: result: Sorry, $features is not supported" >&5 -echo "${ECHO_T}Sorry, $features is not supported" >&6 ;; + *) { echo "$as_me:$LINENO: result: Sorry, $features is not supported" >&5 +echo "${ECHO_T}Sorry, $features is not supported" >&6; } ;; esac -echo "$as_me:$LINENO: checking --with-compiledby argument" >&5 -echo $ECHO_N "checking --with-compiledby argument... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking --with-compiledby argument" >&5 +echo $ECHO_N "checking --with-compiledby argument... $ECHO_C" >&6; } -# Check whether --with-compiledby or --without-compiledby was given. +# Check whether --with-compiledby was given. if test "${with_compiledby+set}" = set; then - withval="$with_compiledby" - compiledby="$withval"; echo "$as_me:$LINENO: result: $withval" >&5 -echo "${ECHO_T}$withval" >&6 -else - compiledby=""; echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi; + withval=$with_compiledby; compiledby="$withval"; { echo "$as_me:$LINENO: result: $withval" >&5 +echo "${ECHO_T}$withval" >&6; } +else + compiledby=""; { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -echo "$as_me:$LINENO: checking --disable-xsmp argument" >&5 -echo $ECHO_N "checking --disable-xsmp argument... $ECHO_C" >&6 -# Check whether --enable-xsmp or --disable-xsmp was given. -if test "${enable_xsmp+set}" = set; then - enableval="$enable_xsmp" +{ echo "$as_me:$LINENO: checking --disable-xsmp argument" >&5 +echo $ECHO_N "checking --disable-xsmp argument... $ECHO_C" >&6; } +# Check whether --enable-xsmp was given. +if test "${enable_xsmp+set}" = set; then + enableval=$enable_xsmp; else enable_xsmp="yes" -fi; +fi + if test "$enable_xsmp" = "yes"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - echo "$as_me:$LINENO: checking --disable-xsmp-interact argument" >&5 -echo $ECHO_N "checking --disable-xsmp-interact argument... $ECHO_C" >&6 - # Check whether --enable-xsmp-interact or --disable-xsmp-interact was given. + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking --disable-xsmp-interact argument" >&5 +echo $ECHO_N "checking --disable-xsmp-interact argument... $ECHO_C" >&6; } + # Check whether --enable-xsmp-interact was given. if test "${enable_xsmp_interact+set}" = set; then - enableval="$enable_xsmp_interact" - + enableval=$enable_xsmp_interact; else enable_xsmp_interact="yes" -fi; +fi + if test "$enable_xsmp_interact" = "yes"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } cat >>confdefs.h <<\_ACEOF #define USE_XSMP_INTERACT 1 _ACEOF else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi -echo "$as_me:$LINENO: checking --enable-mzschemeinterp argument" >&5 -echo $ECHO_N "checking --enable-mzschemeinterp argument... $ECHO_C" >&6 -# Check whether --enable-mzschemeinterp or --disable-mzschemeinterp was given. +{ echo "$as_me:$LINENO: checking --enable-mzschemeinterp argument" >&5 +echo $ECHO_N "checking --enable-mzschemeinterp argument... $ECHO_C" >&6; } +# Check whether --enable-mzschemeinterp was given. if test "${enable_mzschemeinterp+set}" = set; then - enableval="$enable_mzschemeinterp" - + enableval=$enable_mzschemeinterp; else enable_mzschemeinterp="no" -fi; -echo "$as_me:$LINENO: result: $enable_mzschemeinterp" >&5 -echo "${ECHO_T}$enable_mzschemeinterp" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_mzschemeinterp" >&5 +echo "${ECHO_T}$enable_mzschemeinterp" >&6; } if test "$enable_mzschemeinterp" = "yes"; then - echo "$as_me:$LINENO: checking --with-plthome argument" >&5 -echo $ECHO_N "checking --with-plthome argument... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking --with-plthome argument" >&5 +echo $ECHO_N "checking --with-plthome argument... $ECHO_C" >&6; } -# Check whether --with-plthome or --without-plthome was given. +# Check whether --with-plthome was given. if test "${with_plthome+set}" = set; then - withval="$with_plthome" - with_plthome="$withval"; echo "$as_me:$LINENO: result: $with_plthome" >&5 -echo "${ECHO_T}$with_plthome" >&6 -else - with_plthome="";echo "$as_me:$LINENO: result: \"no\"" >&5 -echo "${ECHO_T}\"no\"" >&6 -fi; + withval=$with_plthome; with_plthome="$withval"; { echo "$as_me:$LINENO: result: $with_plthome" >&5 +echo "${ECHO_T}$with_plthome" >&6; } +else + with_plthome="";{ echo "$as_me:$LINENO: result: \"no\"" >&5 +echo "${ECHO_T}\"no\"" >&6; } +fi + if test "X$with_plthome" != "X"; then vi_cv_path_mzscheme_pfx="$with_plthome" else - echo "$as_me:$LINENO: checking PLTHOME environment var" >&5 -echo $ECHO_N "checking PLTHOME environment var... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking PLTHOME environment var" >&5 +echo $ECHO_N "checking PLTHOME environment var... $ECHO_C" >&6; } if test "X$PLTHOME" != "X"; then - echo "$as_me:$LINENO: result: \"$PLTHOME\"" >&5 -echo "${ECHO_T}\"$PLTHOME\"" >&6 + { echo "$as_me:$LINENO: result: \"$PLTHOME\"" >&5 +echo "${ECHO_T}\"$PLTHOME\"" >&6; } vi_cv_path_mzscheme_pfx="$PLTHOME" else - echo "$as_me:$LINENO: result: \"not set\"" >&5 -echo "${ECHO_T}\"not set\"" >&6 + { echo "$as_me:$LINENO: result: \"not set\"" >&5 +echo "${ECHO_T}\"not set\"" >&6; } # Extract the first word of "mzscheme", so it can be a program name with args. set dummy mzscheme; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_vi_cv_path_mzscheme+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3769,28 +4286,29 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_vi_cv_path_mzscheme="$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 +IFS=$as_save_IFS ;; esac fi vi_cv_path_mzscheme=$ac_cv_path_vi_cv_path_mzscheme - if test -n "$vi_cv_path_mzscheme"; then - echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme" >&5 -echo "${ECHO_T}$vi_cv_path_mzscheme" >&6 + { echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme" >&5 +echo "${ECHO_T}$vi_cv_path_mzscheme" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "X$vi_cv_path_mzscheme" != "X"; then lsout=`ls -l $vi_cv_path_mzscheme` if echo "$lsout" | grep -e '->' >/dev/null 2>/dev/null; then @@ -3799,8 +4317,8 @@ fi if test "X$vi_cv_path_mzscheme" != "X"; then - echo "$as_me:$LINENO: checking MzScheme install prefix" >&5 -echo $ECHO_N "checking MzScheme install prefix... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking MzScheme install prefix" >&5 +echo $ECHO_N "checking MzScheme install prefix... $ECHO_C" >&6; } if test "${vi_cv_path_mzscheme_pfx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3811,22 +4329,22 @@ (lambda () (split-path (find-system-path (quote exec-file)))) \ (lambda (base name must-be-dir?) base)) (quote up))))"` fi -echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme_pfx" >&5 -echo "${ECHO_T}$vi_cv_path_mzscheme_pfx" >&6 +{ echo "$as_me:$LINENO: result: $vi_cv_path_mzscheme_pfx" >&5 +echo "${ECHO_T}$vi_cv_path_mzscheme_pfx" >&6; } vi_cv_path_mzscheme_pfx=`echo "$vi_cv_path_mzscheme_pfx" | sed 's+/$++'` fi fi fi if test "X$vi_cv_path_mzscheme_pfx" != "X"; then - echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 -echo $ECHO_N "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 +echo $ECHO_N "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... $ECHO_C" >&6; } if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then - echo "$as_me:$LINENO: result: \"yes\"" >&5 -echo "${ECHO_T}\"yes\"" >&6 + { 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 + { echo "$as_me:$LINENO: result: \"no\"" >&5 +echo "${ECHO_T}\"no\"" >&6; } vi_cv_path_mzscheme_pfx= fi fi @@ -3861,23 +4379,23 @@ fi -echo "$as_me:$LINENO: checking --enable-perlinterp argument" >&5 -echo $ECHO_N "checking --enable-perlinterp argument... $ECHO_C" >&6 -# Check whether --enable-perlinterp or --disable-perlinterp was given. +{ echo "$as_me:$LINENO: checking --enable-perlinterp argument" >&5 +echo $ECHO_N "checking --enable-perlinterp argument... $ECHO_C" >&6; } +# Check whether --enable-perlinterp was given. if test "${enable_perlinterp+set}" = set; then - enableval="$enable_perlinterp" - + enableval=$enable_perlinterp; else enable_perlinterp="no" -fi; -echo "$as_me:$LINENO: result: $enable_perlinterp" >&5 -echo "${ECHO_T}$enable_perlinterp" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_perlinterp" >&5 +echo "${ECHO_T}$enable_perlinterp" >&6; } if test "$enable_perlinterp" = "yes"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_vi_cv_path_perl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3892,30 +4410,31 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_vi_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 +IFS=$as_save_IFS ;; esac fi vi_cv_path_perl=$ac_cv_path_vi_cv_path_perl - if test -n "$vi_cv_path_perl"; then - echo "$as_me:$LINENO: result: $vi_cv_path_perl" >&5 -echo "${ECHO_T}$vi_cv_path_perl" >&6 + { echo "$as_me:$LINENO: result: $vi_cv_path_perl" >&5 +echo "${ECHO_T}$vi_cv_path_perl" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "X$vi_cv_path_perl" != "X"; then - echo "$as_me:$LINENO: checking Perl version" >&5 -echo $ECHO_N "checking Perl version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking Perl version" >&5 +echo $ECHO_N "checking Perl version... $ECHO_C" >&6; } if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then eval `$vi_cv_path_perl -V:usethreads` if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then @@ -3927,18 +4446,18 @@ badthreads=no else badthreads=yes - echo "$as_me:$LINENO: result: >>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&5 -echo "${ECHO_T}>>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&6 + { echo "$as_me:$LINENO: result: >>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&5 +echo "${ECHO_T}>>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&6; } fi else badthreads=yes - echo "$as_me:$LINENO: result: >>> Perl 5.5 with threads cannot be used <<<" >&5 -echo "${ECHO_T}>>> Perl 5.5 with threads cannot be used <<<" >&6 + { echo "$as_me:$LINENO: result: >>> Perl 5.5 with threads cannot be used <<<" >&5 +echo "${ECHO_T}>>> Perl 5.5 with threads cannot be used <<<" >&6; } fi fi if test $badthreads = no; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } eval `$vi_cv_path_perl -V:shrpenv` if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04 shrpenv="" @@ -3953,8 +4472,8 @@ perlldflags=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed \ -e 'ccdlflags' | sed -e 's/-bE:perl.exp//'` - echo "$as_me:$LINENO: checking if compile and link flags for Perl are sane" >&5 -echo $ECHO_N "checking if compile and link flags for Perl are sane... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if compile and link flags for Perl are sane" >&5 +echo $ECHO_N "checking if compile and link flags for Perl are sane... $ECHO_C" >&6; } cflags_save=$CFLAGS libs_save=$LIBS ldflags_save=$LDFLAGS @@ -3985,8 +4504,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3998,15 +4516,16 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; perl_ok=yes + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; perl_ok=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no: PERL DISABLED" >&5 -echo "${ECHO_T}no: PERL DISABLED" >&6; perl_ok=no + { echo "$as_me:$LINENO: result: no: PERL DISABLED" >&5 +echo "${ECHO_T}no: PERL DISABLED" >&6; }; perl_ok=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save @@ -4030,8 +4549,8 @@ fi fi else - echo "$as_me:$LINENO: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5 -echo "${ECHO_T}>>> too old; need Perl version 5.003_01 or later <<<" >&6 + { echo "$as_me:$LINENO: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5 +echo "${ECHO_T}>>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi fi @@ -4062,22 +4581,173 @@ -echo "$as_me:$LINENO: checking --enable-pythoninterp argument" >&5 -echo $ECHO_N "checking --enable-pythoninterp argument... $ECHO_C" >&6 -# Check whether --enable-pythoninterp or --disable-pythoninterp was given. -if test "${enable_pythoninterp+set}" = set; then - enableval="$enable_pythoninterp" +{ echo "$as_me:$LINENO: checking --enable-eclinterp argument" >&5 +echo $ECHO_N "checking --enable-eclinterp argument... $ECHO_C" >&6; } +# Check whether --enable-eclinterp was given. +if test "${enable_eclinterp+set}" = set; then + enableval=$enable_eclinterp; +else + enable_eclinterp="no" +fi + +{ echo "$as_me:$LINENO: result: $enable_eclinterp" >&5 +echo "${ECHO_T}$enable_eclinterp" >&6; } +if test "$enable_eclinterp" = "yes"; then + # Extract the first word of "ecl-config", so it can be a program name with args. +set dummy ecl-config; 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_vi_cv_path_ecl_config+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $vi_cv_path_ecl_config in + [\\/]* | ?:[\\/]*) + ac_cv_path_vi_cv_path_ecl_config="$vi_cv_path_ecl_config" # Let the user override the test with a path. + ;; + *) + 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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_vi_cv_path_ecl_config="$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 +IFS=$as_save_IFS + + ;; +esac +fi +vi_cv_path_ecl_config=$ac_cv_path_vi_cv_path_ecl_config +if test -n "$vi_cv_path_ecl_config"; then + { echo "$as_me:$LINENO: result: $vi_cv_path_ecl_config" >&5 +echo "${ECHO_T}$vi_cv_path_ecl_config" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + if test "X$vi_cv_path_ecl_config" != "X"; then + + if test "${vi_cv_path_ecl_plibs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + vi_cv_path_ecl_plibs=`ecl-config --libs` + +fi + + + ECL_LIBS="${vi_cv_path_ecl_plibs}" + if test "${vi_cv_path_ecl_cflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + vi_cv_path_ecl_cflags=`ecl-config --cflags` + +fi + + ECL_CFLAGS="${vi_cv_path_ecl_cflags}" + + ECL_SRC="if_ecl.c" + ECL_OBJ="objects/if_ecl.o" + + { echo "$as_me:$LINENO: checking if compile and link flags for ECL are sane" >&5 +echo $ECHO_N "checking if compile and link flags for ECL are sane... $ECHO_C" >&6; } + cflags_save=$CFLAGS + libs_save=$LIBS + CFLAGS="$CFLAGS $ECL_CFLAGS" + LIBS="$LIBS $ECL_LIBS" + 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 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; ecl_ok=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no: ECL DISABLED" >&5 +echo "${ECHO_T}no: ECL DISABLED" >&6; }; ecl_ok=no +fi + +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS=$cflags_save + LIBS=$libs_save + if test $ecl_ok = yes; then + cat >>confdefs.h <<\_ACEOF +#define FEAT_ECL 1 +_ACEOF + + else + ECL_SRC= + ECL_OBJ= + ECL_LIBS= + ECL_CFLAGS= + fi + fi +fi + + + + +{ echo "$as_me:$LINENO: checking --enable-pythoninterp argument" >&5 +echo $ECHO_N "checking --enable-pythoninterp argument... $ECHO_C" >&6; } +# Check whether --enable-pythoninterp was given. +if test "${enable_pythoninterp+set}" = set; then + enableval=$enable_pythoninterp; else enable_pythoninterp="no" -fi; -echo "$as_me:$LINENO: result: $enable_pythoninterp" >&5 -echo "${ECHO_T}$enable_pythoninterp" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_pythoninterp" >&5 +echo "${ECHO_T}$enable_pythoninterp" >&6; } if test "$enable_pythoninterp" = "yes"; then # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_vi_cv_path_python+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4092,31 +4762,32 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_vi_cv_path_python="$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 +IFS=$as_save_IFS ;; esac fi vi_cv_path_python=$ac_cv_path_vi_cv_path_python - if test -n "$vi_cv_path_python"; then - echo "$as_me:$LINENO: result: $vi_cv_path_python" >&5 -echo "${ECHO_T}$vi_cv_path_python" >&6 + { echo "$as_me:$LINENO: result: $vi_cv_path_python" >&5 +echo "${ECHO_T}$vi_cv_path_python" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "X$vi_cv_path_python" != "X"; then - echo "$as_me:$LINENO: checking Python version" >&5 -echo $ECHO_N "checking Python version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking Python version" >&5 +echo $ECHO_N "checking Python version... $ECHO_C" >&6; } if test "${vi_cv_var_python_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4124,19 +4795,19 @@ ${vi_cv_path_python} -c 'import sys; print sys.version[:3]'` fi -echo "$as_me:$LINENO: result: $vi_cv_var_python_version" >&5 -echo "${ECHO_T}$vi_cv_var_python_version" >&6 +{ echo "$as_me:$LINENO: result: $vi_cv_var_python_version" >&5 +echo "${ECHO_T}$vi_cv_var_python_version" >&6; } - echo "$as_me:$LINENO: checking Python is 1.4 or better" >&5 -echo $ECHO_N "checking Python is 1.4 or better... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking Python is 1.4 or better" >&5 +echo $ECHO_N "checking Python is 1.4 or better... $ECHO_C" >&6; } if ${vi_cv_path_python} -c \ "import sys; sys.exit(${vi_cv_var_python_version} < 1.4)" then - echo "$as_me:$LINENO: result: yep" >&5 -echo "${ECHO_T}yep" >&6 + { echo "$as_me:$LINENO: result: yep" >&5 +echo "${ECHO_T}yep" >&6; } - echo "$as_me:$LINENO: checking Python's install prefix" >&5 -echo $ECHO_N "checking Python's install prefix... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking Python's install prefix" >&5 +echo $ECHO_N "checking Python's install prefix... $ECHO_C" >&6; } if test "${vi_cv_path_python_pfx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4144,11 +4815,11 @@ ${vi_cv_path_python} -c \ "import sys; print sys.prefix"` fi -echo "$as_me:$LINENO: result: $vi_cv_path_python_pfx" >&5 -echo "${ECHO_T}$vi_cv_path_python_pfx" >&6 +{ echo "$as_me:$LINENO: result: $vi_cv_path_python_pfx" >&5 +echo "${ECHO_T}$vi_cv_path_python_pfx" >&6; } - echo "$as_me:$LINENO: checking Python's execution prefix" >&5 -echo $ECHO_N "checking Python's execution prefix... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking Python's execution prefix" >&5 +echo $ECHO_N "checking Python's execution prefix... $ECHO_C" >&6; } if test "${vi_cv_path_python_epfx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4156,8 +4827,8 @@ ${vi_cv_path_python} -c \ "import sys; print sys.exec_prefix"` fi -echo "$as_me:$LINENO: result: $vi_cv_path_python_epfx" >&5 -echo "${ECHO_T}$vi_cv_path_python_epfx" >&6 +{ echo "$as_me:$LINENO: result: $vi_cv_path_python_epfx" >&5 +echo "${ECHO_T}$vi_cv_path_python_epfx" >&6; } if test "${vi_cv_path_pythonpath+set}" = set; then @@ -4172,14 +4843,14 @@ -# Check whether --with-python-config-dir or --without-python-config-dir was given. +# Check whether --with-python-config-dir was given. if test "${with_python_config_dir+set}" = set; then - withval="$with_python_config_dir" - vi_cv_path_python_conf="${withval}" -fi; + withval=$with_python_config_dir; vi_cv_path_python_conf="${withval}" +fi + - echo "$as_me:$LINENO: checking Python's configuration directory" >&5 -echo $ECHO_N "checking Python's configuration directory... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking Python's configuration directory" >&5 +echo $ECHO_N "checking Python's configuration directory... $ECHO_C" >&6; } if test "${vi_cv_path_python_conf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4195,14 +4866,14 @@ done fi -echo "$as_me:$LINENO: result: $vi_cv_path_python_conf" >&5 -echo "${ECHO_T}$vi_cv_path_python_conf" >&6 +{ echo "$as_me:$LINENO: result: $vi_cv_path_python_conf" >&5 +echo "${ECHO_T}$vi_cv_path_python_conf" >&6; } PYTHON_CONFDIR="${vi_cv_path_python_conf}" if test "X$PYTHON_CONFDIR" = "X"; then - echo "$as_me:$LINENO: result: can't find it!" >&5 -echo "${ECHO_T}can't find it!" >&6 + { echo "$as_me:$LINENO: result: can't find it!" >&5 +echo "${ECHO_T}can't find it!" >&6; } else if test "${vi_cv_path_python_plibs+set}" = set; then @@ -4252,8 +4923,8 @@ fi PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'" - echo "$as_me:$LINENO: checking if -pthread should be used" >&5 -echo $ECHO_N "checking if -pthread should be used... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if -pthread should be used" >&5 +echo $ECHO_N "checking if -pthread should be used... $ECHO_C" >&6; } threadsafe_flag= thread_lib= if test "x$MACOSX" != "xyes"; then @@ -4292,8 +4963,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4305,26 +4975,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; LIBS=$libs_save_old + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; LIBS=$libs_save_old fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - echo "$as_me:$LINENO: checking if compile and link flags for Python are sane" >&5 -echo $ECHO_N "checking if compile and link flags for Python are sane... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if compile and link flags for Python are sane" >&5 +echo $ECHO_N "checking if compile and link flags for Python are sane... $ECHO_C" >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $PYTHON_CFLAGS" @@ -4353,8 +5024,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4366,15 +5036,16 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; python_ok=yes + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; python_ok=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no: PYTHON DISABLED" >&5 -echo "${ECHO_T}no: PYTHON DISABLED" >&6; python_ok=no + { echo "$as_me:$LINENO: result: no: PYTHON DISABLED" >&5 +echo "${ECHO_T}no: PYTHON DISABLED" >&6; }; python_ok=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save @@ -4394,8 +5065,8 @@ fi else - echo "$as_me:$LINENO: result: too old" >&5 -echo "${ECHO_T}too old" >&6 + { echo "$as_me:$LINENO: result: too old" >&5 +echo "${ECHO_T}too old" >&6; } fi fi fi @@ -4406,36 +5077,36 @@ -echo "$as_me:$LINENO: checking --enable-tclinterp argument" >&5 -echo $ECHO_N "checking --enable-tclinterp argument... $ECHO_C" >&6 -# Check whether --enable-tclinterp or --disable-tclinterp was given. +{ echo "$as_me:$LINENO: checking --enable-tclinterp argument" >&5 +echo $ECHO_N "checking --enable-tclinterp argument... $ECHO_C" >&6; } +# Check whether --enable-tclinterp was given. if test "${enable_tclinterp+set}" = set; then - enableval="$enable_tclinterp" - + enableval=$enable_tclinterp; else enable_tclinterp="no" -fi; -echo "$as_me:$LINENO: result: $enable_tclinterp" >&5 -echo "${ECHO_T}$enable_tclinterp" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_tclinterp" >&5 +echo "${ECHO_T}$enable_tclinterp" >&6; } if test "$enable_tclinterp" = "yes"; then - echo "$as_me:$LINENO: checking --with-tclsh argument" >&5 -echo $ECHO_N "checking --with-tclsh argument... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking --with-tclsh argument" >&5 +echo $ECHO_N "checking --with-tclsh argument... $ECHO_C" >&6; } -# Check whether --with-tclsh or --without-tclsh was given. +# Check whether --with-tclsh was given. if test "${with_tclsh+set}" = set; then - withval="$with_tclsh" - tclsh_name="$withval"; echo "$as_me:$LINENO: result: $tclsh_name" >&5 -echo "${ECHO_T}$tclsh_name" >&6 -else - tclsh_name="tclsh8.4"; echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi; + withval=$with_tclsh; tclsh_name="$withval"; { echo "$as_me:$LINENO: result: $tclsh_name" >&5 +echo "${ECHO_T}$tclsh_name" >&6; } +else + tclsh_name="tclsh8.4"; { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4450,35 +5121,36 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_vi_cv_path_tcl="$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 +IFS=$as_save_IFS ;; esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl - if test -n "$vi_cv_path_tcl"; then - echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5 -echo "${ECHO_T}$vi_cv_path_tcl" >&6 + { echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5 +echo "${ECHO_T}$vi_cv_path_tcl" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then tclsh_name="tclsh8.2" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4493,34 +5165,35 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_vi_cv_path_tcl="$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 +IFS=$as_save_IFS ;; esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl - if test -n "$vi_cv_path_tcl"; then - echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5 -echo "${ECHO_T}$vi_cv_path_tcl" >&6 + { echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5 +echo "${ECHO_T}$vi_cv_path_tcl" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.2"; then tclsh_name="tclsh8.0" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4535,34 +5208,35 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_vi_cv_path_tcl="$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 +IFS=$as_save_IFS ;; esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl - if test -n "$vi_cv_path_tcl"; then - echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5 -echo "${ECHO_T}$vi_cv_path_tcl" >&6 + { echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5 +echo "${ECHO_T}$vi_cv_path_tcl" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "X$vi_cv_path_tcl" = "X"; then tclsh_name="tclsh" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4577,39 +5251,40 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_vi_cv_path_tcl="$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 +IFS=$as_save_IFS ;; esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl - if test -n "$vi_cv_path_tcl"; then - echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5 -echo "${ECHO_T}$vi_cv_path_tcl" >&6 + { echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5 +echo "${ECHO_T}$vi_cv_path_tcl" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "X$vi_cv_path_tcl" != "X"; then - echo "$as_me:$LINENO: checking Tcl version" >&5 -echo $ECHO_N "checking Tcl version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking Tcl version" >&5 +echo $ECHO_N "checking Tcl version... $ECHO_C" >&6; } if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -` - echo "$as_me:$LINENO: result: $tclver - OK" >&5 -echo "${ECHO_T}$tclver - OK" >&6; + { echo "$as_me:$LINENO: result: $tclver - OK" >&5 +echo "${ECHO_T}$tclver - OK" >&6; }; tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' | $vi_cv_path_tcl -` - echo "$as_me:$LINENO: checking for location of Tcl include" >&5 -echo $ECHO_N "checking for location of Tcl include... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for location of Tcl include" >&5 +echo $ECHO_N "checking for location of Tcl include... $ECHO_C" >&6; } if test "x$MACOSX" != "xyes"; then tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/include" else @@ -4617,20 +5292,20 @@ fi for try in $tclinc; do if test -f "$try/tcl.h"; then - echo "$as_me:$LINENO: result: $try/tcl.h" >&5 -echo "${ECHO_T}$try/tcl.h" >&6 + { echo "$as_me:$LINENO: result: $try/tcl.h" >&5 +echo "${ECHO_T}$try/tcl.h" >&6; } TCL_INC=$try break fi done if test -z "$TCL_INC"; then - echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } SKIP_TCL=YES fi if test -z "$SKIP_TCL"; then - echo "$as_me:$LINENO: checking for location of tclConfig.sh script" >&5 -echo $ECHO_N "checking for location of tclConfig.sh script... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for location of tclConfig.sh script" >&5 +echo $ECHO_N "checking for location of tclConfig.sh script... $ECHO_C" >&6; } if test "x$MACOSX" != "xyes"; then tclcnf=`echo $tclinc | sed s/include/lib/g` else @@ -4638,8 +5313,8 @@ fi for try in $tclcnf; do if test -f $try/tclConfig.sh; then - echo "$as_me:$LINENO: result: $try/tclConfig.sh" >&5 -echo "${ECHO_T}$try/tclConfig.sh" >&6 + { echo "$as_me:$LINENO: result: $try/tclConfig.sh" >&5 +echo "${ECHO_T}$try/tclConfig.sh" >&6; } . $try/tclConfig.sh TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` @@ -4647,18 +5322,18 @@ fi done if test -z "$TCL_LIBS"; then - echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 - echo "$as_me:$LINENO: checking for Tcl library by myself" >&5 -echo $ECHO_N "checking for Tcl library by myself... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } + { echo "$as_me:$LINENO: checking for Tcl library by myself" >&5 +echo $ECHO_N "checking for Tcl library by myself... $ECHO_C" >&6; } tcllib=`echo $tclinc | sed s/include/lib/g` for ext in .so .a ; do for ver in "" $tclver ; do for try in $tcllib ; do trylib=tcl$ver$ext if test -f $try/lib$trylib ; then - echo "$as_me:$LINENO: result: $try/lib$trylib" >&5 -echo "${ECHO_T}$try/lib$trylib" >&6 + { echo "$as_me:$LINENO: result: $try/lib$trylib" >&5 +echo "${ECHO_T}$try/lib$trylib" >&6; } TCL_LIBS="-L$try -ltcl$ver -ldl -lm" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then @@ -4670,8 +5345,8 @@ done done if test -z "$TCL_LIBS"; then - echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } SKIP_TCL=YES fi fi @@ -4687,8 +5362,8 @@ fi fi else - echo "$as_me:$LINENO: result: too old; need Tcl version 8.0 or later" >&5 -echo "${ECHO_T}too old; need Tcl version 8.0 or later" >&6 + { echo "$as_me:$LINENO: result: too old; need Tcl version 8.0 or later" >&5 +echo "${ECHO_T}too old; need Tcl version 8.0 or later" >&6; } fi fi fi @@ -4698,23 +5373,23 @@ -echo "$as_me:$LINENO: checking --enable-rubyinterp argument" >&5 -echo $ECHO_N "checking --enable-rubyinterp argument... $ECHO_C" >&6 -# Check whether --enable-rubyinterp or --disable-rubyinterp was given. +{ echo "$as_me:$LINENO: checking --enable-rubyinterp argument" >&5 +echo $ECHO_N "checking --enable-rubyinterp argument... $ECHO_C" >&6; } +# Check whether --enable-rubyinterp was given. if test "${enable_rubyinterp+set}" = set; then - enableval="$enable_rubyinterp" - + enableval=$enable_rubyinterp; else enable_rubyinterp="no" -fi; -echo "$as_me:$LINENO: result: $enable_rubyinterp" >&5 -echo "${ECHO_T}$enable_rubyinterp" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_rubyinterp" >&5 +echo "${ECHO_T}$enable_rubyinterp" >&6; } if test "$enable_rubyinterp" = "yes"; then # Extract the first word of "ruby", so it can be a program name with args. set dummy ruby; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_vi_cv_path_ruby+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4729,39 +5404,40 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_vi_cv_path_ruby="$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 +IFS=$as_save_IFS ;; esac fi vi_cv_path_ruby=$ac_cv_path_vi_cv_path_ruby - if test -n "$vi_cv_path_ruby"; then - echo "$as_me:$LINENO: result: $vi_cv_path_ruby" >&5 -echo "${ECHO_T}$vi_cv_path_ruby" >&6 + { echo "$as_me:$LINENO: result: $vi_cv_path_ruby" >&5 +echo "${ECHO_T}$vi_cv_path_ruby" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "X$vi_cv_path_ruby" != "X"; then - echo "$as_me:$LINENO: checking Ruby version" >&5 -echo $ECHO_N "checking Ruby version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking Ruby version" >&5 +echo $ECHO_N "checking Ruby version... $ECHO_C" >&6; } if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 - echo "$as_me:$LINENO: checking Ruby header files" >&5 -echo $ECHO_N "checking Ruby header files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } + { echo "$as_me:$LINENO: checking Ruby header files" >&5 +echo $ECHO_N "checking Ruby header files... $ECHO_C" >&6; } rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null` if test "X$rubyhdrdir" != "X"; then - echo "$as_me:$LINENO: result: $rubyhdrdir" >&5 -echo "${ECHO_T}$rubyhdrdir" >&6 + { echo "$as_me:$LINENO: result: $rubyhdrdir" >&5 +echo "${ECHO_T}$rubyhdrdir" >&6; } RUBY_CFLAGS="-I$rubyhdrdir" rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LIBS"]'` if test "X$rubylibs" != "X"; then @@ -4796,12 +5472,12 @@ _ACEOF else - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } fi else - echo "$as_me:$LINENO: result: too old; need Ruby version 1.6.0 or later" >&5 -echo "${ECHO_T}too old; need Ruby version 1.6.0 or later" >&6 + { echo "$as_me:$LINENO: result: too old; need Ruby version 1.6.0 or later" >&5 +echo "${ECHO_T}too old; need Ruby version 1.6.0 or later" >&6; } fi fi fi @@ -4811,17 +5487,17 @@ -echo "$as_me:$LINENO: checking --enable-cscope argument" >&5 -echo $ECHO_N "checking --enable-cscope argument... $ECHO_C" >&6 -# Check whether --enable-cscope or --disable-cscope was given. +{ echo "$as_me:$LINENO: checking --enable-cscope argument" >&5 +echo $ECHO_N "checking --enable-cscope argument... $ECHO_C" >&6; } +# Check whether --enable-cscope was given. if test "${enable_cscope+set}" = set; then - enableval="$enable_cscope" - + enableval=$enable_cscope; else enable_cscope="no" -fi; -echo "$as_me:$LINENO: result: $enable_cscope" >&5 -echo "${ECHO_T}$enable_cscope" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_cscope" >&5 +echo "${ECHO_T}$enable_cscope" >&6; } if test "$enable_cscope" = "yes"; then cat >>confdefs.h <<\_ACEOF #define FEAT_CSCOPE 1 @@ -4829,17 +5505,17 @@ fi -echo "$as_me:$LINENO: checking --enable-workshop argument" >&5 -echo $ECHO_N "checking --enable-workshop argument... $ECHO_C" >&6 -# Check whether --enable-workshop or --disable-workshop was given. +{ echo "$as_me:$LINENO: checking --enable-workshop argument" >&5 +echo $ECHO_N "checking --enable-workshop argument... $ECHO_C" >&6; } +# Check whether --enable-workshop was given. if test "${enable_workshop+set}" = set; then - enableval="$enable_workshop" - + enableval=$enable_workshop; else enable_workshop="no" -fi; -echo "$as_me:$LINENO: result: $enable_workshop" >&5 -echo "${ECHO_T}$enable_workshop" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_workshop" >&5 +echo "${ECHO_T}$enable_workshop" >&6; } if test "$enable_workshop" = "yes"; then cat >>confdefs.h <<\_ACEOF #define FEAT_SUN_WORKSHOP 1 @@ -4854,21 +5530,21 @@ fi fi -echo "$as_me:$LINENO: checking --disable-netbeans argument" >&5 -echo $ECHO_N "checking --disable-netbeans argument... $ECHO_C" >&6 -# Check whether --enable-netbeans or --disable-netbeans was given. +{ echo "$as_me:$LINENO: checking --disable-netbeans argument" >&5 +echo $ECHO_N "checking --disable-netbeans argument... $ECHO_C" >&6; } +# Check whether --enable-netbeans was given. if test "${enable_netbeans+set}" = set; then - enableval="$enable_netbeans" - + enableval=$enable_netbeans; else enable_netbeans="yes" -fi; +fi + if test "$enable_netbeans" = "yes"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 +echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; } if test "${ac_cv_lib_socket_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4881,17 +5557,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 socket (); int main () { -socket (); +return socket (); ; return 0; } @@ -4905,8 +5581,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4923,14 +5598,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_socket_socket=no + ac_cv_lib_socket_socket=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_socket_socket" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; } if test $ac_cv_lib_socket_socket = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 @@ -4941,8 +5617,8 @@ fi -echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4955,17 +5631,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 gethostbyname (); int main () { -gethostbyname (); +return gethostbyname (); ; return 0; } @@ -4979,8 +5655,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4997,14 +5672,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_nsl_gethostbyname=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_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } if test $ac_cv_lib_nsl_gethostbyname = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 @@ -5014,8 +5690,8 @@ fi - echo "$as_me:$LINENO: checking whether compiling netbeans integration is possible" >&5 -echo $ECHO_N "checking whether compiling netbeans integration is possible... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether compiling netbeans integration is possible" >&5 +echo $ECHO_N "checking whether compiling netbeans integration is possible... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5063,8 +5739,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5076,20 +5751,21 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; enable_netbeans="no" + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; enable_netbeans="no" fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi if test "$enable_netbeans" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -5102,17 +5778,17 @@ fi -echo "$as_me:$LINENO: checking --enable-sniff argument" >&5 -echo $ECHO_N "checking --enable-sniff argument... $ECHO_C" >&6 -# Check whether --enable-sniff or --disable-sniff was given. +{ echo "$as_me:$LINENO: checking --enable-sniff argument" >&5 +echo $ECHO_N "checking --enable-sniff argument... $ECHO_C" >&6; } +# Check whether --enable-sniff was given. if test "${enable_sniff+set}" = set; then - enableval="$enable_sniff" - + enableval=$enable_sniff; else enable_sniff="no" -fi; -echo "$as_me:$LINENO: result: $enable_sniff" >&5 -echo "${ECHO_T}$enable_sniff" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_sniff" >&5 +echo "${ECHO_T}$enable_sniff" >&6; } if test "$enable_sniff" = "yes"; then cat >>confdefs.h <<\_ACEOF #define FEAT_SNIFF 1 @@ -5124,17 +5800,17 @@ fi -echo "$as_me:$LINENO: checking --enable-multibyte argument" >&5 -echo $ECHO_N "checking --enable-multibyte argument... $ECHO_C" >&6 -# Check whether --enable-multibyte or --disable-multibyte was given. +{ echo "$as_me:$LINENO: checking --enable-multibyte argument" >&5 +echo $ECHO_N "checking --enable-multibyte argument... $ECHO_C" >&6; } +# Check whether --enable-multibyte was given. if test "${enable_multibyte+set}" = set; then - enableval="$enable_multibyte" - + enableval=$enable_multibyte; else enable_multibyte="no" -fi; -echo "$as_me:$LINENO: result: $enable_multibyte" >&5 -echo "${ECHO_T}$enable_multibyte" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_multibyte" >&5 +echo "${ECHO_T}$enable_multibyte" >&6; } if test "$enable_multibyte" = "yes"; then cat >>confdefs.h <<\_ACEOF #define FEAT_MBYTE 1 @@ -5142,53 +5818,53 @@ fi -echo "$as_me:$LINENO: checking --enable-hangulinput argument" >&5 -echo $ECHO_N "checking --enable-hangulinput argument... $ECHO_C" >&6 -# Check whether --enable-hangulinput or --disable-hangulinput was given. +{ echo "$as_me:$LINENO: checking --enable-hangulinput argument" >&5 +echo $ECHO_N "checking --enable-hangulinput argument... $ECHO_C" >&6; } +# Check whether --enable-hangulinput was given. if test "${enable_hangulinput+set}" = set; then - enableval="$enable_hangulinput" - + enableval=$enable_hangulinput; else enable_hangulinput="no" -fi; -echo "$as_me:$LINENO: result: $enable_hangulinput" >&5 -echo "${ECHO_T}$enable_hangulinput" >&6 - -echo "$as_me:$LINENO: checking --enable-xim argument" >&5 -echo $ECHO_N "checking --enable-xim argument... $ECHO_C" >&6 -# Check whether --enable-xim or --disable-xim was given. +fi + +{ echo "$as_me:$LINENO: result: $enable_hangulinput" >&5 +echo "${ECHO_T}$enable_hangulinput" >&6; } + +{ echo "$as_me:$LINENO: checking --enable-xim argument" >&5 +echo $ECHO_N "checking --enable-xim argument... $ECHO_C" >&6; } +# Check whether --enable-xim was given. if test "${enable_xim+set}" = set; then - enableval="$enable_xim" - echo "$as_me:$LINENO: result: $enable_xim" >&5 -echo "${ECHO_T}$enable_xim" >&6 -else - enable_xim="auto"; echo "$as_me:$LINENO: result: defaulting to auto" >&5 -echo "${ECHO_T}defaulting to auto" >&6 -fi; - -echo "$as_me:$LINENO: checking --enable-fontset argument" >&5 -echo $ECHO_N "checking --enable-fontset argument... $ECHO_C" >&6 -# Check whether --enable-fontset or --disable-fontset was given. -if test "${enable_fontset+set}" = set; then - enableval="$enable_fontset" + enableval=$enable_xim; { echo "$as_me:$LINENO: result: $enable_xim" >&5 +echo "${ECHO_T}$enable_xim" >&6; } +else + enable_xim="auto"; { echo "$as_me:$LINENO: result: defaulting to auto" >&5 +echo "${ECHO_T}defaulting to auto" >&6; } +fi + +{ echo "$as_me:$LINENO: checking --enable-fontset argument" >&5 +echo $ECHO_N "checking --enable-fontset argument... $ECHO_C" >&6; } +# Check whether --enable-fontset was given. +if test "${enable_fontset+set}" = set; then + enableval=$enable_fontset; else enable_fontset="no" -fi; -echo "$as_me:$LINENO: result: $enable_fontset" >&5 -echo "${ECHO_T}$enable_fontset" >&6 +fi + +{ echo "$as_me:$LINENO: result: $enable_fontset" >&5 +echo "${ECHO_T}$enable_fontset" >&6; } test -z "$with_x" && with_x=yes test "${enable_gui-yes}" != no -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && with_x=yes if test "$with_x" = no; then - echo "$as_me:$LINENO: result: defaulting to: don't HAVE_X11" >&5 -echo "${ECHO_T}defaulting to: don't HAVE_X11" >&6 + { echo "$as_me:$LINENO: result: defaulting to: don't HAVE_X11" >&5 +echo "${ECHO_T}defaulting to: don't HAVE_X11" >&6; } else # Extract the first word of "xmkmf", so it can be a program name with args. set dummy xmkmf; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_xmkmfpath+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5203,37 +5879,41 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_xmkmfpath="$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 +IFS=$as_save_IFS ;; esac fi xmkmfpath=$ac_cv_path_xmkmfpath - if test -n "$xmkmfpath"; then - echo "$as_me:$LINENO: result: $xmkmfpath" >&5 -echo "${ECHO_T}$xmkmfpath" >&6 + { echo "$as_me:$LINENO: result: $xmkmfpath" >&5 +echo "${ECHO_T}$xmkmfpath" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 -# Check whether --with-x or --without-x was given. +if test "x$ac_path_x_has_been_run" != xyes; then + { echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } + +ac_path_x_has_been_run=yes + +# Check whether --with-x was given. if test "${with_x+set}" = set; then - withval="$with_x" + withval=$with_x; +fi -fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. @@ -5248,7 +5928,7 @@ else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir +rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir # Make sure to not put "make" in the Imakefile rules, since we grep it out. @@ -5256,7 +5936,7 @@ acfindx: @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' _ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. @@ -5270,7 +5950,7 @@ # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in - /usr/include) ;; + /usr/include) ac_x_includes= ;; *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -5279,7 +5959,7 @@ esac fi cd .. - rm -fr conftest.dir + rm -f -r conftest.dir fi # Standard set of common directories for X headers. @@ -5320,7 +6000,7 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5328,7 +6008,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -5355,12 +6035,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi done fi + rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = no @@ -5376,11 +6057,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -5394,8 +6075,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5414,18 +6094,19 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LIBS=$ac_save_LIBS + LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r $ac_dir/libX11.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi done done fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no @@ -5445,8 +6126,8 @@ fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -5455,10 +6136,15 @@ # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + # It might be that x_includes is empty (headers are found in the + # standard search path. Then output the corresponding message + ac_out_x_includes=$x_includes + test "x$x_includes" = x && ac_out_x_includes="in standard search path" + { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6; } fi +fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -5479,8 +6165,8 @@ # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5506,8 +6192,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5524,13 +6209,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_R_nospace=no + ac_R_nospace=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" @@ -5558,8 +6244,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5576,17 +6261,18 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_R_space=no + ac_R_space=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 + { echo "$as_me:$LINENO: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6; } fi fi LIBS=$ac_xsave_LIBS @@ -5611,17 +6297,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 XOpenDisplay (); int main () { -XOpenDisplay (); +return XOpenDisplay (); ; return 0; } @@ -5635,8 +6321,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5653,8 +6338,8 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5667,17 +6352,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } @@ -5691,8 +6376,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5709,21 +6393,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_dnet_ntoa=no + ac_cv_lib_dnet_dnet_ntoa=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_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5736,17 +6421,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } @@ -5760,8 +6445,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5778,20 +6462,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_stub_dnet_ntoa=no + ac_cv_lib_dnet_stub_dnet_ntoa=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_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -5804,8 +6490,8 @@ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5832,30 +6518,24 @@ #undef gethostbyname -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 gethostbyname (); /* 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_gethostbyname) || defined (__stub___gethostbyname) +#if defined __stub_gethostbyname || defined __stub___gethostbyname choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != gethostbyname; +return gethostbyname (); ; return 0; } @@ -5869,8 +6549,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5887,17 +6566,18 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_gethostbyname=no + ac_cv_func_gethostbyname=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5910,17 +6590,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 gethostbyname (); int main () { -gethostbyname (); +return gethostbyname (); ; return 0; } @@ -5934,8 +6614,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -5952,21 +6631,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nsl_gethostbyname=no + ac_cv_lib_nsl_gethostbyname=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_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5979,17 +6659,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 gethostbyname (); int main () { -gethostbyname (); +return gethostbyname (); ; return 0; } @@ -6003,8 +6683,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6021,14 +6700,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_bsd_gethostbyname=no + ac_cv_lib_bsd_gethostbyname=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_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -6043,8 +6723,8 @@ # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; } if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6071,30 +6751,24 @@ #undef connect -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 connect (); /* 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_connect) || defined (__stub___connect) +#if defined __stub_connect || defined __stub___connect choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != connect; +return connect (); ; return 0; } @@ -6108,8 +6782,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6126,17 +6799,18 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_connect=no + ac_cv_func_connect=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6; } if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6149,17 +6823,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 connect (); int main () { -connect (); +return connect (); ; return 0; } @@ -6173,8 +6847,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6191,14 +6864,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_socket_connect=no + ac_cv_lib_socket_connect=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_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -6206,8 +6880,8 @@ fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; } if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6234,30 +6908,24 @@ #undef remove -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 remove (); /* 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_remove) || defined (__stub___remove) +#if defined __stub_remove || defined __stub___remove choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != remove; +return remove (); ; return 0; } @@ -6271,8 +6939,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6289,17 +6956,18 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_remove=no + ac_cv_func_remove=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6; } if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6312,17 +6980,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 remove (); int main () { -remove (); +return remove (); ; return 0; } @@ -6336,8 +7004,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6354,14 +7021,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_posix_remove=no + ac_cv_lib_posix_remove=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_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -6369,8 +7037,8 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6397,30 +7065,24 @@ #undef shmat -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 shmat (); /* 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_shmat) || defined (__stub___shmat) +#if defined __stub_shmat || defined __stub___shmat choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shmat; +return shmat (); ; return 0; } @@ -6434,8 +7096,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6452,17 +7113,18 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shmat=no + ac_cv_func_shmat=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; } if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6475,17 +7137,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 shmat (); int main () { -shmat (); +return shmat (); ; return 0; } @@ -6499,8 +7161,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6517,14 +7178,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ipc_shmat=no + ac_cv_lib_ipc_shmat=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_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -6541,8 +7203,8 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6555,17 +7217,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 IceConnectionNumber (); int main () { -IceConnectionNumber (); +return IceConnectionNumber (); ; return 0; } @@ -6579,8 +7241,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6597,14 +7258,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ICE_IceConnectionNumber=no + ac_cv_lib_ICE_IceConnectionNumber=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_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -6623,8 +7285,8 @@ if test -d "$x_includes" && test ! -d "$x_libraries"; then x_libraries=`echo "$x_includes" | sed s/include/lib/` - echo "$as_me:$LINENO: result: Corrected X libraries to $x_libraries" >&5 -echo "${ECHO_T}Corrected X libraries to $x_libraries" >&6 + { echo "$as_me:$LINENO: result: Corrected X libraries to $x_libraries" >&5 +echo "${ECHO_T}Corrected X libraries to $x_libraries" >&6; } X_LIBS="$X_LIBS -L$x_libraries" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then @@ -6634,8 +7296,8 @@ if test -d "$x_libraries" && test ! -d "$x_includes"; then x_includes=`echo "$x_libraries" | sed s/lib/include/` - echo "$as_me:$LINENO: result: Corrected X includes to $x_includes" >&5 -echo "${ECHO_T}Corrected X includes to $x_includes" >&6 + { echo "$as_me:$LINENO: result: Corrected X includes to $x_includes" >&5 +echo "${ECHO_T}Corrected X includes to $x_includes" >&6; } X_CFLAGS="$X_CFLAGS -I$x_includes" fi @@ -6644,8 +7306,8 @@ X_LIBS="`echo $X_LIBS\ | sed -e 's%-R/usr/lib %%' -e 's%-R /usr/lib %%'`" - echo "$as_me:$LINENO: checking if X11 header files can be found" >&5 -echo $ECHO_N "checking if X11 header files can be found... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if X11 header files can be found" >&5 +echo $ECHO_N "checking if X11 header files can be found... $ECHO_C" >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat >conftest.$ac_ext <<_ACEOF @@ -6672,8 +7334,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6685,15 +7346,16 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; no_x=yes + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; no_x=yes fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$cflags_save @@ -6710,8 +7372,8 @@ ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="-L$x_libraries $LDFLAGS" - echo "$as_me:$LINENO: checking for _XdmcpAuthDoIt in -lXdmcp" >&5 -echo $ECHO_N "checking for _XdmcpAuthDoIt in -lXdmcp... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _XdmcpAuthDoIt in -lXdmcp" >&5 +echo $ECHO_N "checking for _XdmcpAuthDoIt in -lXdmcp... $ECHO_C" >&6; } if test "${ac_cv_lib_Xdmcp__XdmcpAuthDoIt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6724,17 +7386,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 _XdmcpAuthDoIt (); int main () { -_XdmcpAuthDoIt (); +return _XdmcpAuthDoIt (); ; return 0; } @@ -6748,8 +7410,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6766,21 +7427,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xdmcp__XdmcpAuthDoIt=no + ac_cv_lib_Xdmcp__XdmcpAuthDoIt=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_Xdmcp__XdmcpAuthDoIt" >&5 -echo "${ECHO_T}$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5 +echo "${ECHO_T}$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; } if test $ac_cv_lib_Xdmcp__XdmcpAuthDoIt = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp" fi - echo "$as_me:$LINENO: checking for IceOpenConnection in -lICE" >&5 -echo $ECHO_N "checking for IceOpenConnection in -lICE... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for IceOpenConnection in -lICE" >&5 +echo $ECHO_N "checking for IceOpenConnection in -lICE... $ECHO_C" >&6; } if test "${ac_cv_lib_ICE_IceOpenConnection+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6793,17 +7455,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 IceOpenConnection (); int main () { -IceOpenConnection (); +return IceOpenConnection (); ; return 0; } @@ -6817,8 +7479,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6835,22 +7496,23 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ICE_IceOpenConnection=no + ac_cv_lib_ICE_IceOpenConnection=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_ICE_IceOpenConnection" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceOpenConnection" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceOpenConnection" >&6; } if test $ac_cv_lib_ICE_IceOpenConnection = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE" fi LDFLAGS="$X_LIBS $ac_save_LDFLAGS" - echo "$as_me:$LINENO: checking for XpmCreatePixmapFromData in -lXpm" >&5 -echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6; } if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6863,17 +7525,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 XpmCreatePixmapFromData (); int main () { -XpmCreatePixmapFromData (); +return XpmCreatePixmapFromData (); ; return 0; } @@ -6887,8 +7549,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6905,21 +7566,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xpm_XpmCreatePixmapFromData=no + ac_cv_lib_Xpm_XpmCreatePixmapFromData=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_Xpm_XpmCreatePixmapFromData" >&5 -echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 +echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; } if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then X_PRE_LIBS="$X_PRE_LIBS -lXpm" fi - echo "$as_me:$LINENO: checking if X11 header files implicitly declare return values" >&5 -echo $ECHO_N "checking if X11 header files implicitly declare return values... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if X11 header files implicitly declare return values" >&5 +echo $ECHO_N "checking if X11 header files implicitly declare return values... $ECHO_C" >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS -Werror" cat >conftest.$ac_ext <<_ACEOF @@ -6946,8 +7608,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6959,13 +7620,13 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -CFLAGS="$CFLAGS -Wno-implicit-int" + CFLAGS="$CFLAGS -Wno-implicit-int" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6990,8 +7651,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7003,19 +7663,21 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cflags_save="$cflags_save -Wno-implicit-int" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cflags_save="$cflags_save -Wno-implicit-int" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: test failed" >&5 -echo "${ECHO_T}test failed" >&6 + { echo "$as_me:$LINENO: result: test failed" >&5 +echo "${ECHO_T}test failed" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$cflags_save @@ -7026,15 +7688,15 @@ test "x$with_x" = xno -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no -echo "$as_me:$LINENO: checking --enable-gui argument" >&5 -echo $ECHO_N "checking --enable-gui argument... $ECHO_C" >&6 -# Check whether --enable-gui or --disable-gui was given. +{ echo "$as_me:$LINENO: checking --enable-gui argument" >&5 +echo $ECHO_N "checking --enable-gui argument... $ECHO_C" >&6; } +# Check whether --enable-gui was given. if test "${enable_gui+set}" = set; then - enableval="$enable_gui" - + enableval=$enable_gui; else enable_gui="auto" -fi; +fi + enable_gui_canon=`echo "_$enable_gui" | \ sed 's/[ _+-]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` @@ -7052,44 +7714,44 @@ if test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then SKIP_PHOTON= case "$enable_gui_canon" in - no) echo "$as_me:$LINENO: result: no GUI support" >&5 -echo "${ECHO_T}no GUI support" >&6 + no) { echo "$as_me:$LINENO: result: no GUI support" >&5 +echo "${ECHO_T}no GUI support" >&6; } SKIP_PHOTON=YES ;; - yes|"") echo "$as_me:$LINENO: result: yes - automatic GUI support" >&5 -echo "${ECHO_T}yes - automatic GUI support" >&6 ;; - auto) echo "$as_me:$LINENO: result: auto - automatic GUI support" >&5 -echo "${ECHO_T}auto - automatic GUI support" >&6 ;; - photon) echo "$as_me:$LINENO: result: Photon GUI support" >&5 -echo "${ECHO_T}Photon GUI support" >&6 ;; - *) echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5 -echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6 + yes|"") { echo "$as_me:$LINENO: result: yes - automatic GUI support" >&5 +echo "${ECHO_T}yes - automatic GUI support" >&6; } ;; + auto) { echo "$as_me:$LINENO: result: auto - automatic GUI support" >&5 +echo "${ECHO_T}auto - automatic GUI support" >&6; } ;; + photon) { echo "$as_me:$LINENO: result: Photon GUI support" >&5 +echo "${ECHO_T}Photon GUI support" >&6; } ;; + *) { echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5 +echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6; } SKIP_PHOTON=YES ;; esac elif test "x$MACOSX" = "xyes" -a "x$with_x" = "xno" ; then SKIP_CARBON= case "$enable_gui_canon" in - no) echo "$as_me:$LINENO: result: no GUI support" >&5 -echo "${ECHO_T}no GUI support" >&6 + no) { echo "$as_me:$LINENO: result: no GUI support" >&5 +echo "${ECHO_T}no GUI support" >&6; } SKIP_CARBON=YES ;; - yes|"") echo "$as_me:$LINENO: result: yes - automatic GUI support" >&5 -echo "${ECHO_T}yes - automatic GUI support" >&6 ;; - auto) echo "$as_me:$LINENO: result: auto - automatic GUI support" >&5 -echo "${ECHO_T}auto - automatic GUI support" >&6 ;; - carbon) echo "$as_me:$LINENO: result: Carbon GUI support" >&5 -echo "${ECHO_T}Carbon GUI support" >&6 ;; - *) echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5 -echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6 + yes|"") { echo "$as_me:$LINENO: result: yes - automatic GUI support" >&5 +echo "${ECHO_T}yes - automatic GUI support" >&6; } ;; + auto) { echo "$as_me:$LINENO: result: auto - automatic GUI support" >&5 +echo "${ECHO_T}auto - automatic GUI support" >&6; } ;; + carbon) { echo "$as_me:$LINENO: result: Carbon GUI support" >&5 +echo "${ECHO_T}Carbon GUI support" >&6; } ;; + *) { echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5 +echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6; } SKIP_CARBON=YES ;; esac else case "$enable_gui_canon" in - no|none) echo "$as_me:$LINENO: result: no GUI support" >&5 -echo "${ECHO_T}no GUI support" >&6 ;; - yes|""|auto) echo "$as_me:$LINENO: result: yes/auto - automatic GUI support" >&5 -echo "${ECHO_T}yes/auto - automatic GUI support" >&6 + no|none) { echo "$as_me:$LINENO: result: no GUI support" >&5 +echo "${ECHO_T}no GUI support" >&6; } ;; + yes|""|auto) { echo "$as_me:$LINENO: result: yes/auto - automatic GUI support" >&5 +echo "${ECHO_T}yes/auto - automatic GUI support" >&6; } SKIP_GTK= SKIP_GTK2= SKIP_GNOME= @@ -7097,49 +7759,49 @@ SKIP_ATHENA= SKIP_NEXTAW= SKIP_CARBON=;; - gtk) echo "$as_me:$LINENO: result: GTK+ 1.x GUI support" >&5 -echo "${ECHO_T}GTK+ 1.x GUI support" >&6 + gtk) { echo "$as_me:$LINENO: result: GTK+ 1.x GUI support" >&5 +echo "${ECHO_T}GTK+ 1.x GUI support" >&6; } SKIP_GTK=;; - gtk2) echo "$as_me:$LINENO: result: GTK+ 2.x GUI support" >&5 -echo "${ECHO_T}GTK+ 2.x GUI support" >&6 + gtk2) { echo "$as_me:$LINENO: result: GTK+ 2.x GUI support" >&5 +echo "${ECHO_T}GTK+ 2.x GUI support" >&6; } SKIP_GTK= SKIP_GTK2=;; - gnome) echo "$as_me:$LINENO: result: GNOME 1.x GUI support" >&5 -echo "${ECHO_T}GNOME 1.x GUI support" >&6 + gnome) { echo "$as_me:$LINENO: result: GNOME 1.x GUI support" >&5 +echo "${ECHO_T}GNOME 1.x GUI support" >&6; } SKIP_GNOME= SKIP_GTK=;; - gnome2) echo "$as_me:$LINENO: result: GNOME 2.x GUI support" >&5 -echo "${ECHO_T}GNOME 2.x GUI support" >&6 + gnome2) { echo "$as_me:$LINENO: result: GNOME 2.x GUI support" >&5 +echo "${ECHO_T}GNOME 2.x GUI support" >&6; } SKIP_GNOME= SKIP_GTK= SKIP_GTK2=;; - motif) echo "$as_me:$LINENO: result: Motif GUI support" >&5 -echo "${ECHO_T}Motif GUI support" >&6 + motif) { echo "$as_me:$LINENO: result: Motif GUI support" >&5 +echo "${ECHO_T}Motif GUI support" >&6; } SKIP_MOTIF=;; - athena) echo "$as_me:$LINENO: result: Athena GUI support" >&5 -echo "${ECHO_T}Athena GUI support" >&6 + athena) { echo "$as_me:$LINENO: result: Athena GUI support" >&5 +echo "${ECHO_T}Athena GUI support" >&6; } SKIP_ATHENA=;; - nextaw) echo "$as_me:$LINENO: result: neXtaw GUI support" >&5 -echo "${ECHO_T}neXtaw GUI support" >&6 + nextaw) { echo "$as_me:$LINENO: result: neXtaw GUI support" >&5 +echo "${ECHO_T}neXtaw GUI support" >&6; } SKIP_NEXTAW=;; - *) echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5 -echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6 ;; + *) { echo "$as_me:$LINENO: result: Sorry, $enable_gui GUI is not supported" >&5 +echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6; } ;; esac fi if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a "$enable_gui_canon" != "gtk2"; then - echo "$as_me:$LINENO: checking whether or not to look for GTK" >&5 -echo $ECHO_N "checking whether or not to look for GTK... $ECHO_C" >&6 - # Check whether --enable-gtk-check or --disable-gtk-check was given. + { echo "$as_me:$LINENO: checking whether or not to look for GTK" >&5 +echo $ECHO_N "checking whether or not to look for GTK... $ECHO_C" >&6; } + # Check whether --enable-gtk-check was given. if test "${enable_gtk_check+set}" = set; then - enableval="$enable_gtk_check" - + enableval=$enable_gtk_check; else enable_gtk_check="yes" -fi; - echo "$as_me:$LINENO: result: $enable_gtk_check" >&5 -echo "${ECHO_T}$enable_gtk_check" >&6 +fi + + { echo "$as_me:$LINENO: result: $enable_gtk_check" >&5 +echo "${ECHO_T}$enable_gtk_check" >&6; } if test "x$enable_gtk_check" = "xno"; then SKIP_GTK=YES SKIP_GNOME=YES @@ -7148,17 +7810,17 @@ if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \ -a "$enable_gui_canon" != "gnome2"; then - echo "$as_me:$LINENO: checking whether or not to look for GTK+ 2" >&5 -echo $ECHO_N "checking whether or not to look for GTK+ 2... $ECHO_C" >&6 - # Check whether --enable-gtk2-check or --disable-gtk2-check was given. + { echo "$as_me:$LINENO: checking whether or not to look for GTK+ 2" >&5 +echo $ECHO_N "checking whether or not to look for GTK+ 2... $ECHO_C" >&6; } + # Check whether --enable-gtk2-check was given. if test "${enable_gtk2_check+set}" = set; then - enableval="$enable_gtk2_check" - + enableval=$enable_gtk2_check; else enable_gtk2_check="yes" -fi; - echo "$as_me:$LINENO: result: $enable_gtk2_check" >&5 -echo "${ECHO_T}$enable_gtk2_check" >&6 +fi + + { echo "$as_me:$LINENO: result: $enable_gtk2_check" >&5 +echo "${ECHO_T}$enable_gtk2_check" >&6; } if test "x$enable_gtk2_check" = "xno"; then SKIP_GTK2=YES fi @@ -7166,85 +7828,85 @@ if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome" \ -a "$enable_gui_canon" != "gnome2"; then - echo "$as_me:$LINENO: checking whether or not to look for GNOME" >&5 -echo $ECHO_N "checking whether or not to look for GNOME... $ECHO_C" >&6 - # Check whether --enable-gnome-check or --disable-gnome-check was given. + { echo "$as_me:$LINENO: checking whether or not to look for GNOME" >&5 +echo $ECHO_N "checking whether or not to look for GNOME... $ECHO_C" >&6; } + # Check whether --enable-gnome-check was given. if test "${enable_gnome_check+set}" = set; then - enableval="$enable_gnome_check" - + enableval=$enable_gnome_check; else enable_gnome_check="no" -fi; - echo "$as_me:$LINENO: result: $enable_gnome_check" >&5 -echo "${ECHO_T}$enable_gnome_check" >&6 +fi + + { echo "$as_me:$LINENO: result: $enable_gnome_check" >&5 +echo "${ECHO_T}$enable_gnome_check" >&6; } if test "x$enable_gnome_check" = "xno"; then SKIP_GNOME=YES fi fi if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then - echo "$as_me:$LINENO: checking whether or not to look for Motif" >&5 -echo $ECHO_N "checking whether or not to look for Motif... $ECHO_C" >&6 - # Check whether --enable-motif-check or --disable-motif-check was given. + { echo "$as_me:$LINENO: checking whether or not to look for Motif" >&5 +echo $ECHO_N "checking whether or not to look for Motif... $ECHO_C" >&6; } + # Check whether --enable-motif-check was given. if test "${enable_motif_check+set}" = set; then - enableval="$enable_motif_check" - + enableval=$enable_motif_check; else enable_motif_check="yes" -fi; - echo "$as_me:$LINENO: result: $enable_motif_check" >&5 -echo "${ECHO_T}$enable_motif_check" >&6 +fi + + { echo "$as_me:$LINENO: result: $enable_motif_check" >&5 +echo "${ECHO_T}$enable_motif_check" >&6; } if test "x$enable_motif_check" = "xno"; then SKIP_MOTIF=YES fi fi if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then - echo "$as_me:$LINENO: checking whether or not to look for Athena" >&5 -echo $ECHO_N "checking whether or not to look for Athena... $ECHO_C" >&6 - # Check whether --enable-athena-check or --disable-athena-check was given. + { echo "$as_me:$LINENO: checking whether or not to look for Athena" >&5 +echo $ECHO_N "checking whether or not to look for Athena... $ECHO_C" >&6; } + # Check whether --enable-athena-check was given. if test "${enable_athena_check+set}" = set; then - enableval="$enable_athena_check" - + enableval=$enable_athena_check; else enable_athena_check="yes" -fi; - echo "$as_me:$LINENO: result: $enable_athena_check" >&5 -echo "${ECHO_T}$enable_athena_check" >&6 +fi + + { echo "$as_me:$LINENO: result: $enable_athena_check" >&5 +echo "${ECHO_T}$enable_athena_check" >&6; } if test "x$enable_athena_check" = "xno"; then SKIP_ATHENA=YES fi fi if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then - echo "$as_me:$LINENO: checking whether or not to look for neXtaw" >&5 -echo $ECHO_N "checking whether or not to look for neXtaw... $ECHO_C" >&6 - # Check whether --enable-nextaw-check or --disable-nextaw-check was given. + { echo "$as_me:$LINENO: checking whether or not to look for neXtaw" >&5 +echo $ECHO_N "checking whether or not to look for neXtaw... $ECHO_C" >&6; } + # Check whether --enable-nextaw-check was given. if test "${enable_nextaw_check+set}" = set; then - enableval="$enable_nextaw_check" - + enableval=$enable_nextaw_check; else enable_nextaw_check="yes" -fi; - echo "$as_me:$LINENO: result: $enable_nextaw_check" >&5 -echo "${ECHO_T}$enable_nextaw_check" >&6; +fi + + { echo "$as_me:$LINENO: result: $enable_nextaw_check" >&5 +echo "${ECHO_T}$enable_nextaw_check" >&6; }; if test "x$enable_nextaw_check" = "xno"; then SKIP_NEXTAW=YES fi fi if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then - echo "$as_me:$LINENO: checking whether or not to look for Carbon" >&5 -echo $ECHO_N "checking whether or not to look for Carbon... $ECHO_C" >&6 - # Check whether --enable-carbon-check or --disable-carbon-check was given. + { echo "$as_me:$LINENO: checking whether or not to look for Carbon" >&5 +echo $ECHO_N "checking whether or not to look for Carbon... $ECHO_C" >&6; } + # Check whether --enable-carbon-check was given. if test "${enable_carbon_check+set}" = set; then - enableval="$enable_carbon_check" - + enableval=$enable_carbon_check; else enable_carbon_check="yes" -fi; - echo "$as_me:$LINENO: result: $enable_carbon_check" >&5 -echo "${ECHO_T}$enable_carbon_check" >&6; +fi + + { echo "$as_me:$LINENO: result: $enable_carbon_check" >&5 +echo "${ECHO_T}$enable_carbon_check" >&6; }; if test "x$enable_carbon_check" = "xno"; then SKIP_CARBON=YES fi @@ -7252,10 +7914,10 @@ if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then - echo "$as_me:$LINENO: checking for Carbon GUI" >&5 -echo $ECHO_N "checking for Carbon GUI... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; + { echo "$as_me:$LINENO: checking for Carbon GUI" >&5 +echo $ECHO_N "checking for Carbon GUI... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; GUITYPE=CARBONGUI if test "$VIMNAME" = "vim"; then VIMNAME=Vim @@ -7287,47 +7949,47 @@ if test -z "$SKIP_GTK"; then - echo "$as_me:$LINENO: checking --with-gtk-prefix argument" >&5 -echo $ECHO_N "checking --with-gtk-prefix argument... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking --with-gtk-prefix argument" >&5 +echo $ECHO_N "checking --with-gtk-prefix argument... $ECHO_C" >&6; } -# Check whether --with-gtk-prefix or --without-gtk-prefix was given. +# Check whether --with-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then - withval="$with_gtk_prefix" - gtk_config_prefix="$withval"; echo "$as_me:$LINENO: result: $gtk_config_prefix" >&5 -echo "${ECHO_T}$gtk_config_prefix" >&6 -else - gtk_config_prefix=""; echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi; + withval=$with_gtk_prefix; gtk_config_prefix="$withval"; { echo "$as_me:$LINENO: result: $gtk_config_prefix" >&5 +echo "${ECHO_T}$gtk_config_prefix" >&6; } +else + gtk_config_prefix=""; { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + - echo "$as_me:$LINENO: checking --with-gtk-exec-prefix argument" >&5 -echo $ECHO_N "checking --with-gtk-exec-prefix argument... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking --with-gtk-exec-prefix argument" >&5 +echo $ECHO_N "checking --with-gtk-exec-prefix argument... $ECHO_C" >&6; } -# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. +# Check whether --with-gtk-exec-prefix was given. if test "${with_gtk_exec_prefix+set}" = set; then - withval="$with_gtk_exec_prefix" - gtk_config_exec_prefix="$withval"; echo "$as_me:$LINENO: result: $gtk_config_prefix" >&5 -echo "${ECHO_T}$gtk_config_prefix" >&6 -else - gtk_config_exec_prefix=""; echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi; - - echo "$as_me:$LINENO: checking --disable-gtktest argument" >&5 -echo $ECHO_N "checking --disable-gtktest argument... $ECHO_C" >&6 - # Check whether --enable-gtktest or --disable-gtktest was given. -if test "${enable_gtktest+set}" = set; then - enableval="$enable_gtktest" + withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval"; { echo "$as_me:$LINENO: result: $gtk_config_prefix" >&5 +echo "${ECHO_T}$gtk_config_prefix" >&6; } +else + gtk_config_exec_prefix=""; { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + { echo "$as_me:$LINENO: checking --disable-gtktest argument" >&5 +echo $ECHO_N "checking --disable-gtktest argument... $ECHO_C" >&6; } + # Check whether --enable-gtktest was given. +if test "${enable_gtktest+set}" = set; then + enableval=$enable_gtktest; else enable_gtktest=yes -fi; +fi + if test "x$enable_gtktest" = "xyes" ; then - echo "$as_me:$LINENO: result: gtk test enabled" >&5 -echo "${ECHO_T}gtk test enabled" >&6 + { echo "$as_me:$LINENO: result: gtk test enabled" >&5 +echo "${ECHO_T}gtk test enabled" >&6; } else - echo "$as_me:$LINENO: result: gtk test disabled" >&5 -echo "${ECHO_T}gtk test disabled" >&6 + { echo "$as_me:$LINENO: result: gtk test disabled" >&5 +echo "${ECHO_T}gtk test disabled" >&6; } fi if test "x$gtk_config_prefix" != "x" ; then @@ -7341,8 +8003,8 @@ if test "X$GTK_CONFIG" = "X"; then # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GTK_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7357,33 +8019,34 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GTK_CONFIG="$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 +IFS=$as_save_IFS test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" ;; esac fi GTK_CONFIG=$ac_cv_path_GTK_CONFIG - if test -n "$GTK_CONFIG"; then - echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 -echo "${ECHO_T}$GTK_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $GTK_CONFIG" >&5 +echo "${ECHO_T}$GTK_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "X$GTK_CONFIG" = "Xno"; then # Extract the first word of "gtk12-config", so it can be a program name with args. set dummy gtk12-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GTK12_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7398,39 +8061,40 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GTK12_CONFIG="$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 +IFS=$as_save_IFS test -z "$ac_cv_path_GTK12_CONFIG" && ac_cv_path_GTK12_CONFIG="no" ;; esac fi GTK12_CONFIG=$ac_cv_path_GTK12_CONFIG - if test -n "$GTK12_CONFIG"; then - echo "$as_me:$LINENO: result: $GTK12_CONFIG" >&5 -echo "${ECHO_T}$GTK12_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $GTK12_CONFIG" >&5 +echo "${ECHO_T}$GTK12_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + GTK_CONFIG="$GTK12_CONFIG" fi else - echo "$as_me:$LINENO: result: Using GTK configuration program $GTK_CONFIG" >&5 -echo "${ECHO_T}Using GTK configuration program $GTK_CONFIG" >&6 + { echo "$as_me:$LINENO: result: Using GTK configuration program $GTK_CONFIG" >&5 +echo "${ECHO_T}Using GTK configuration program $GTK_CONFIG" >&6; } fi if test "X$PKG_CONFIG" = "X"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7445,28 +8109,29 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$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 +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "x$GTK_CONFIG:$PKG_CONFIG" != "xno:no"; then @@ -7475,8 +8140,8 @@ if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then { min_gtk_version=2.2.0 - echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 +echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; } no_gtk="" if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ && $PKG_CONFIG --exists gtk+-2.0; then @@ -7574,27 +8239,29 @@ ( exit $ac_status ) no_gtk=yes fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" } fi if test "x$no_gtk" = x ; then if test "x$enable_gtktest" = "xyes"; then - echo "$as_me:$LINENO: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -echo "${ECHO_T}yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6 + { echo "$as_me:$LINENO: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +echo "${ECHO_T}yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } else - echo "$as_me:$LINENO: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -echo "${ECHO_T}found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6 + { echo "$as_me:$LINENO: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +echo "${ECHO_T}found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } fi GUI_LIB_LOC="$GTK_LIBDIR" GTK_LIBNAME="$GTK_LIBS" GUI_INC_LOC="$GTK_CFLAGS" else { - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } GTK_CFLAGS="" GTK_LIBS="" : @@ -7625,8 +8292,8 @@ if test "X$GTK_CONFIG" != "Xno" -o "X$PKG_CONFIG" != "Xno"; then { min_gtk_version=1.1.16 - echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GTK - version >= $min_gtk_version" >&5 +echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6; } no_gtk="" if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ && $PKG_CONFIG --exists gtk+-2.0; then @@ -7724,26 +8391,28 @@ ( exit $ac_status ) no_gtk=yes fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" } fi if test "x$no_gtk" = x ; then if test "x$enable_gtktest" = "xyes"; then - echo "$as_me:$LINENO: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -echo "${ECHO_T}yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6 + { echo "$as_me:$LINENO: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +echo "${ECHO_T}yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } else - echo "$as_me:$LINENO: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -echo "${ECHO_T}found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6 + { echo "$as_me:$LINENO: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +echo "${ECHO_T}found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } fi GTK_LIBNAME="$GTK_LIBS" GUI_INC_LOC="$GTK_CFLAGS" else { - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } GTK_CFLAGS="" GTK_LIBS="" : @@ -7771,8 +8440,8 @@ if test "x$GUITYPE" = "xGTK"; then if test "$gtk_major_version" = 1 -a "0$gtk_minor_version" -lt 2 \ -o "$gtk_major_version" = 1 -a "$gtk_minor_version" = 2 -a "0$gtk_micro_version" -lt 3; then - echo "$as_me:$LINENO: result: this GTK version is old; version 1.2.3 or later is recommended" >&5 -echo "${ECHO_T}this GTK version is old; version 1.2.3 or later is recommended" >&6 + { echo "$as_me:$LINENO: result: this GTK version is old; version 1.2.3 or later is recommended" >&5 +echo "${ECHO_T}this GTK version is old; version 1.2.3 or later is recommended" >&6; } else { if test "0$gtk_major_version" -ge 2; then @@ -7797,26 +8466,25 @@ -# Check whether --with-gnome-includes or --without-gnome-includes was given. +# Check whether --with-gnome-includes was given. if test "${with_gnome_includes+set}" = set; then - withval="$with_gnome_includes" - CFLAGS="$CFLAGS -I$withval" + withval=$with_gnome_includes; CFLAGS="$CFLAGS -I$withval" + +fi -fi; -# Check whether --with-gnome-libs or --without-gnome-libs was given. +# Check whether --with-gnome-libs was given. if test "${with_gnome_libs+set}" = set; then - withval="$with_gnome_libs" - LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval + withval=$with_gnome_libs; LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval + +fi -fi; -# Check whether --with-gnome or --without-gnome was given. +# Check whether --with-gnome was given. if test "${with_gnome+set}" = set; then - withval="$with_gnome" - if test x$withval = xyes; then + withval=$with_gnome; if test x$withval = xyes; then want_gnome=yes have_gnome=yes else @@ -7831,34 +8499,35 @@ fi else want_gnome=yes -fi; +fi + if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then { - echo "$as_me:$LINENO: checking for libgnomeui-2.0" >&5 -echo $ECHO_N "checking for libgnomeui-2.0... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for libgnomeui-2.0" >&5 +echo $ECHO_N "checking for libgnomeui-2.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists libgnomeui-2.0; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` - echo "$as_me:$LINENO: checking for FreeBSD" >&5 -echo $ECHO_N "checking for FreeBSD... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for FreeBSD" >&5 +echo $ECHO_N "checking for FreeBSD... $ECHO_C" >&6; } if test "`(uname) 2>/dev/null`" = FreeBSD; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE" GNOME_LIBS="$GNOME_LIBS -pthread" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi have_gnome=yes else - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } if test "x" = xfail; then { { echo "$as_me:$LINENO: error: Could not find libgnomeui-2.0 via pkg-config" >&5 echo "$as_me: error: Could not find libgnomeui-2.0 via pkg-config" >&2;} @@ -7870,8 +8539,8 @@ { # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GNOME_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7886,43 +8555,44 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GNOME_CONFIG="$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 +IFS=$as_save_IFS test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no" ;; esac fi GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG - if test -n "$GNOME_CONFIG"; then - echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5 -echo "${ECHO_T}$GNOME_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5 +echo "${ECHO_T}$GNOME_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test "$GNOME_CONFIG" = "no"; then no_gnome_config="yes" else - echo "$as_me:$LINENO: checking if $GNOME_CONFIG works" >&5 -echo $ECHO_N "checking if $GNOME_CONFIG works... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if $GNOME_CONFIG works" >&5 +echo $ECHO_N "checking if $GNOME_CONFIG works... $ECHO_C" >&6; } if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`" GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" have_gnome=yes else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } no_gnome_config="yes" fi fi @@ -7938,18 +8608,18 @@ fi if test "$no_gnome_config" = "yes"; then - echo "$as_me:$LINENO: checking for gnomeConf.sh file in $gnome_prefix" >&5 -echo $ECHO_N "checking for gnomeConf.sh file in $gnome_prefix... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gnomeConf.sh file in $gnome_prefix" >&5 +echo $ECHO_N "checking for gnomeConf.sh file in $gnome_prefix... $ECHO_C" >&6; } if test -f $gnome_prefix/gnomeConf.sh; then - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 + { echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6; } echo "loading gnome configuration from" \ "$gnome_prefix/gnomeConf.sh" . $gnome_prefix/gnomeConf.sh have_gnome=yes else - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } if test x = xfail; then { { echo "$as_me:$LINENO: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&5 echo "$as_me: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&2;} @@ -7980,8 +8650,8 @@ gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX" GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" - echo "$as_me:$LINENO: checking for location of Motif GUI includes" >&5 -echo $ECHO_N "checking for location of Motif GUI includes... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for location of Motif GUI includes" >&5 +echo $ECHO_N "checking for location of Motif GUI includes... $ECHO_C" >&6; } gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/include/g` $GUI_INC_LOC" GUI_INC_LOC= for try in $gui_includes; do @@ -7992,42 +8662,42 @@ if test -n "$GUI_INC_LOC"; then if test "$GUI_INC_LOC" = /usr/include; then GUI_INC_LOC= - echo "$as_me:$LINENO: result: in default path" >&5 -echo "${ECHO_T}in default path" >&6 + { echo "$as_me:$LINENO: result: in default path" >&5 +echo "${ECHO_T}in default path" >&6; } else - echo "$as_me:$LINENO: result: $GUI_INC_LOC" >&5 -echo "${ECHO_T}$GUI_INC_LOC" >&6 + { echo "$as_me:$LINENO: result: $GUI_INC_LOC" >&5 +echo "${ECHO_T}$GUI_INC_LOC" >&6; } fi else - echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } SKIP_MOTIF=YES fi fi if test -z "$SKIP_MOTIF"; then - echo "$as_me:$LINENO: checking --with-motif-lib argument" >&5 -echo $ECHO_N "checking --with-motif-lib argument... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking --with-motif-lib argument" >&5 +echo $ECHO_N "checking --with-motif-lib argument... $ECHO_C" >&6; } -# Check whether --with-motif-lib or --without-motif-lib was given. +# Check whether --with-motif-lib was given. if test "${with_motif_lib+set}" = set; then - withval="$with_motif_lib" - MOTIF_LIBNAME="${withval}" -fi; + withval=$with_motif_lib; MOTIF_LIBNAME="${withval}" +fi + if test -n "$MOTIF_LIBNAME"; then - echo "$as_me:$LINENO: result: $MOTIF_LIBNAME" >&5 -echo "${ECHO_T}$MOTIF_LIBNAME" >&6 + { echo "$as_me:$LINENO: result: $MOTIF_LIBNAME" >&5 +echo "${ECHO_T}$MOTIF_LIBNAME" >&6; } GUI_LIB_LOC= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" - echo "$as_me:$LINENO: checking for location of Motif GUI libs" >&5 -echo $ECHO_N "checking for location of Motif GUI libs... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for location of Motif GUI libs" >&5 +echo $ECHO_N "checking for location of Motif GUI libs... $ECHO_C" >&6; } gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC" GUI_LIB_LOC= for try in $gui_libs; do @@ -8040,12 +8710,12 @@ if test -n "$GUI_LIB_LOC"; then if test "$GUI_LIB_LOC" = /usr/lib; then GUI_LIB_LOC= - echo "$as_me:$LINENO: result: in default path" >&5 -echo "${ECHO_T}in default path" >&6 + { echo "$as_me:$LINENO: result: in default path" >&5 +echo "${ECHO_T}in default path" >&6; } else if test -n "$GUI_LIB_LOC"; then - echo "$as_me:$LINENO: result: $GUI_LIB_LOC" >&5 -echo "${ECHO_T}$GUI_LIB_LOC" >&6 + { echo "$as_me:$LINENO: result: $GUI_LIB_LOC" >&5 +echo "${ECHO_T}$GUI_LIB_LOC" >&6; } if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC" @@ -8054,8 +8724,8 @@ fi MOTIF_LIBNAME=-lXm else - echo "$as_me:$LINENO: result: " >&5 -echo "${ECHO_T}" >&6 + { echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6; } SKIP_MOTIF=YES fi fi @@ -8072,8 +8742,8 @@ GUI_X_LIBS= if test -z "$SKIP_ATHENA"; then - echo "$as_me:$LINENO: checking if Athena header files can be found" >&5 -echo $ECHO_N "checking if Athena header files can be found... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if Athena header files can be found" >&5 +echo $ECHO_N "checking if Athena header files can be found... $ECHO_C" >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat >conftest.$ac_ext <<_ACEOF @@ -8102,8 +8772,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8115,15 +8784,16 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; SKIP_ATHENA=YES + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; SKIP_ATHENA=YES fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$cflags_save fi @@ -8133,8 +8803,8 @@ fi if test -z "$SKIP_NEXTAW"; then - echo "$as_me:$LINENO: checking if neXtaw header files can be found" >&5 -echo $ECHO_N "checking if neXtaw header files can be found... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if neXtaw header files can be found" >&5 +echo $ECHO_N "checking if neXtaw header files can be found... $ECHO_C" >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat >conftest.$ac_ext <<_ACEOF @@ -8163,8 +8833,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8176,15 +8845,16 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; SKIP_NEXTAW=YES + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; SKIP_NEXTAW=YES fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS=$cflags_save fi @@ -8203,8 +8873,8 @@ ldflags_save=$LDFLAGS LDFLAGS="$X_LIBS $LDFLAGS" - echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5 -echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5 +echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6; } if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8217,17 +8887,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 XShapeQueryExtension (); int main () { -XShapeQueryExtension (); +return XShapeQueryExtension (); ; return 0; } @@ -8241,8 +8911,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8259,20 +8928,21 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xext_XShapeQueryExtension=no + ac_cv_lib_Xext_XShapeQueryExtension=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_Xext_XShapeQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then GUI_X_LIBS="-lXext" fi - echo "$as_me:$LINENO: checking for wslen in -lw" >&5 -echo $ECHO_N "checking for wslen in -lw... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for wslen in -lw" >&5 +echo $ECHO_N "checking for wslen in -lw... $ECHO_C" >&6; } if test "${ac_cv_lib_w_wslen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8285,17 +8955,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 wslen (); int main () { -wslen (); +return wslen (); ; return 0; } @@ -8309,8 +8979,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8327,20 +8996,21 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_w_wslen=no + ac_cv_lib_w_wslen=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_w_wslen" >&5 -echo "${ECHO_T}$ac_cv_lib_w_wslen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5 +echo "${ECHO_T}$ac_cv_lib_w_wslen" >&6; } if test $ac_cv_lib_w_wslen = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lw" fi - echo "$as_me:$LINENO: checking for dlsym in -ldl" >&5 -echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 + { 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 else @@ -8353,17 +9023,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 dlsym (); ; return 0; } @@ -8377,8 +9047,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8395,20 +9064,21 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dl_dlsym=no + ac_cv_lib_dl_dlsym=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_dlsym" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 +{ 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 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl" fi - echo "$as_me:$LINENO: checking for XmuCreateStippledPixmap in -lXmu" >&5 -echo $ECHO_N "checking for XmuCreateStippledPixmap in -lXmu... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XmuCreateStippledPixmap in -lXmu" >&5 +echo $ECHO_N "checking for XmuCreateStippledPixmap in -lXmu... $ECHO_C" >&6; } if test "${ac_cv_lib_Xmu_XmuCreateStippledPixmap+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8421,17 +9091,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 XmuCreateStippledPixmap (); int main () { -XmuCreateStippledPixmap (); +return XmuCreateStippledPixmap (); ; return 0; } @@ -8445,8 +9115,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8463,21 +9132,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xmu_XmuCreateStippledPixmap=no + ac_cv_lib_Xmu_XmuCreateStippledPixmap=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_Xmu_XmuCreateStippledPixmap" >&5 -echo "${ECHO_T}$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5 +echo "${ECHO_T}$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; } if test $ac_cv_lib_Xmu_XmuCreateStippledPixmap = yes; then GUI_X_LIBS="-lXmu $GUI_X_LIBS" fi if test -z "$SKIP_MOTIF"; then - echo "$as_me:$LINENO: checking for XpEndJob in -lXp" >&5 -echo $ECHO_N "checking for XpEndJob in -lXp... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XpEndJob in -lXp" >&5 +echo $ECHO_N "checking for XpEndJob in -lXp... $ECHO_C" >&6; } if test "${ac_cv_lib_Xp_XpEndJob+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8490,17 +9160,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 XpEndJob (); int main () { -XpEndJob (); +return XpEndJob (); ; return 0; } @@ -8514,8 +9184,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8532,14 +9201,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xp_XpEndJob=no + ac_cv_lib_Xp_XpEndJob=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_Xp_XpEndJob" >&5 -echo "${ECHO_T}$ac_cv_lib_Xp_XpEndJob" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5 +echo "${ECHO_T}$ac_cv_lib_Xp_XpEndJob" >&6; } if test $ac_cv_lib_Xp_XpEndJob = yes; then GUI_X_LIBS="-lXp $GUI_X_LIBS" fi @@ -8547,8 +9217,8 @@ fi LDFLAGS=$ldflags_save - echo "$as_me:$LINENO: checking for extra X11 defines" >&5 -echo $ECHO_N "checking for extra X11 defines... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for extra X11 defines" >&5 +echo $ECHO_N "checking for extra X11 defines... $ECHO_C" >&6; } NARROW_PROTO= rm -fr conftestdir if mkdir conftestdir; then @@ -8564,11 +9234,11 @@ rm -fr conftestdir fi if test -z "$NARROW_PROTO"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - echo "$as_me:$LINENO: result: $NARROW_PROTO" >&5 -echo "${ECHO_T}$NARROW_PROTO" >&6 + { echo "$as_me:$LINENO: result: $NARROW_PROTO" >&5 +echo "${ECHO_T}$NARROW_PROTO" >&6; } fi fi @@ -8580,18 +9250,19 @@ for ac_header in X11/SM/SMlib.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 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&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 +{ 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 @@ -8610,8 +9281,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8628,15 +9298,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 +{ 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 @@ -8670,9 +9341,10 @@ 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 +{ 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 @@ -8696,25 +9368,19 @@ 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 the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_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 "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -8738,18 +9404,19 @@ for ac_header in X11/xpm.h X11/Sunkeysym.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 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&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 +{ 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 @@ -8768,8 +9435,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8786,15 +9452,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 +{ 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 @@ -8828,9 +9495,10 @@ 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 +{ 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 @@ -8854,25 +9522,19 @@ 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 the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_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 "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -8886,8 +9548,8 @@ if test ! "$enable_xim" = "no"; then - echo "$as_me:$LINENO: checking for XIMText in X11/Xlib.h" >&5 -echo $ECHO_N "checking for XIMText in X11/Xlib.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XIMText in X11/Xlib.h" >&5 +echo $ECHO_N "checking for XIMText in X11/Xlib.h... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8898,11 +9560,11 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "XIMText" >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no; xim has been disabled" >&5 -echo "${ECHO_T}no; xim has been disabled" >&6; enable_xim = "no" + { echo "$as_me:$LINENO: result: no; xim has been disabled" >&5 +echo "${ECHO_T}no; xim has been disabled" >&6; }; enable_xim = "no" fi rm -f conftest* @@ -8911,8 +9573,8 @@ if test "$enable_xim" = "auto" -a "$enable_hangulinput" != "yes" \ -a "x$GUITYPE" != "xNONE" ; then - echo "$as_me:$LINENO: result: X GUI selected; xim has been enabled" >&5 -echo "${ECHO_T}X GUI selected; xim has been enabled" >&6 + { echo "$as_me:$LINENO: result: X GUI selected; xim has been enabled" >&5 +echo "${ECHO_T}X GUI selected; xim has been enabled" >&6; } enable_xim="yes" fi fi @@ -8920,8 +9582,8 @@ if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" - echo "$as_me:$LINENO: checking for X11/Xmu/Editres.h" >&5 -echo $ECHO_N "checking for X11/Xmu/Editres.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/Xmu/Editres.h" >&5 +echo $ECHO_N "checking for X11/Xmu/Editres.h... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8948,8 +9610,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -8961,8 +9622,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_X11_XMU_EDITRES_H 1 _ACEOF @@ -8971,9 +9632,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cppflags_save fi @@ -8992,18 +9654,19 @@ Xm/UnhighlightT.h Xm/Notebook.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 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&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 +{ 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 @@ -9022,8 +9685,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9040,15 +9702,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 +{ 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 @@ -9082,9 +9745,10 @@ 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 +{ 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 @@ -9108,25 +9772,19 @@ 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 the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_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 "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -9140,8 +9798,8 @@ if test $ac_cv_header_Xm_XpmP_h = yes; then - echo "$as_me:$LINENO: checking for XpmAttributes_21 in Xm/XpmP.h" >&5 -echo $ECHO_N "checking for XpmAttributes_21 in Xm/XpmP.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XpmAttributes_21 in Xm/XpmP.h" >&5 +echo $ECHO_N "checking for XpmAttributes_21 in Xm/XpmP.h... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9166,8 +9824,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9179,8 +9836,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define XPMATTRIBUTES_TYPE XpmAttributes_21 _ACEOF @@ -9188,13 +9845,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; cat >>confdefs.h <<\_ACEOF #define XPMATTRIBUTES_TYPE XpmAttributes _ACEOF fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext else cat >>confdefs.h <<\_ACEOF @@ -9206,18 +9864,18 @@ fi if test "x$GUITYPE" = "xNONE" -a "$enable_xim" = "yes"; then - echo "$as_me:$LINENO: result: no GUI selected; xim has been disabled" >&5 -echo "${ECHO_T}no GUI selected; xim has been disabled" >&6 + { echo "$as_me:$LINENO: result: no GUI selected; xim has been disabled" >&5 +echo "${ECHO_T}no GUI selected; xim has been disabled" >&6; } enable_xim="no" fi if test "x$GUITYPE" = "xNONE" -a "$enable_fontset" = "yes"; then - echo "$as_me:$LINENO: result: no GUI selected; fontset has been disabled" >&5 -echo "${ECHO_T}no GUI selected; fontset has been disabled" >&6 + { echo "$as_me:$LINENO: result: no GUI selected; fontset has been disabled" >&5 +echo "${ECHO_T}no GUI selected; fontset has been disabled" >&6; } enable_fontset="no" fi if test "x$GUITYPE:$enable_fontset" = "xGTK:yes" -a "0$gtk_major_version" -ge 2; then - echo "$as_me:$LINENO: result: GTK+ 2 GUI selected; fontset has been disabled" >&5 -echo "${ECHO_T}GTK+ 2 GUI selected; fontset has been disabled" >&6 + { echo "$as_me:$LINENO: result: GTK+ 2 GUI selected; fontset has been disabled" >&5 +echo "${ECHO_T}GTK+ 2 GUI selected; fontset has been disabled" >&6; } enable_fontset="no" fi @@ -9254,8 +9912,8 @@ if test "$enable_hangulinput" = "yes"; then if test "x$GUITYPE" = "xNONE"; then - echo "$as_me:$LINENO: result: no GUI selected; hangul input has been disabled" >&5 -echo "${ECHO_T}no GUI selected; hangul input has been disabled" >&6 + { echo "$as_me:$LINENO: result: no GUI selected; hangul input has been disabled" >&5 +echo "${ECHO_T}no GUI selected; hangul input has been disabled" >&6; } enable_hangulinput=no else cat >>confdefs.h <<\_ACEOF @@ -9270,8 +9928,8 @@ fi -echo "$as_me:$LINENO: checking quality of toupper" >&5 -echo $ECHO_N "checking quality of toupper... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking quality of toupper" >&5 +echo $ECHO_N "checking quality of toupper... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: failed to compile test program" >&5 echo "$as_me: error: failed to compile test program" >&2;} @@ -9300,22 +9958,24 @@ cat >>confdefs.h <<\_ACEOF #define BROKEN_TOUPPER 1 _ACEOF - echo "$as_me:$LINENO: result: bad" >&5 -echo "${ECHO_T}bad" >&6 + { echo "$as_me:$LINENO: result: bad" >&5 +echo "${ECHO_T}bad" >&6; } 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: result: good" >&5 -echo "${ECHO_T}good" >&6 +{ echo "$as_me:$LINENO: result: good" >&5 +echo "${ECHO_T}good" >&6; } fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: checking whether __DATE__ and __TIME__ work" >&5 -echo $ECHO_N "checking whether __DATE__ and __TIME__ work... $ECHO_C" >&6 + + +{ echo "$as_me:$LINENO: checking whether __DATE__ and __TIME__ work" >&5 +echo $ECHO_N "checking whether __DATE__ and __TIME__ work... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9340,8 +10000,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9353,8 +10012,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_DATE_TIME 1 _ACEOF @@ -9362,23 +10021,24 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test "${ac_cv_header_elf_h+set}" = set; then - echo "$as_me:$LINENO: checking for elf.h" >&5 -echo $ECHO_N "checking for elf.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for elf.h" >&5 +echo $ECHO_N "checking for elf.h... $ECHO_C" >&6; } if test "${ac_cv_header_elf_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_elf_h" >&5 -echo "${ECHO_T}$ac_cv_header_elf_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_elf_h" >&5 +echo "${ECHO_T}$ac_cv_header_elf_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking elf.h usability" >&5 -echo $ECHO_N "checking elf.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking elf.h usability" >&5 +echo $ECHO_N "checking elf.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9397,8 +10057,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9415,15 +10074,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 elf.h presence" >&5 -echo $ECHO_N "checking elf.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking elf.h presence" >&5 +echo $ECHO_N "checking elf.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9457,9 +10117,10 @@ 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 +{ 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 @@ -9483,25 +10144,18 @@ echo "$as_me: WARNING: elf.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: elf.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: elf.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for elf.h" >&5 -echo $ECHO_N "checking for elf.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for elf.h" >&5 +echo $ECHO_N "checking for elf.h... $ECHO_C" >&6; } if test "${ac_cv_header_elf_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_elf_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_elf_h" >&5 -echo "${ECHO_T}$ac_cv_header_elf_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_elf_h" >&5 +echo "${ECHO_T}$ac_cv_header_elf_h" >&6; } fi if test $ac_cv_header_elf_h = yes; then @@ -9511,8 +10165,8 @@ if test "$HAS_ELF" = 1; then -echo "$as_me:$LINENO: checking for main in -lelf" >&5 -echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for main in -lelf" >&5 +echo $ECHO_N "checking for main in -lelf... $ECHO_C" >&6; } if test "${ac_cv_lib_elf_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9529,7 +10183,7 @@ int main () { -main (); +return main (); ; return 0; } @@ -9543,8 +10197,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9561,14 +10214,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_elf_main=no + ac_cv_lib_elf_main=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_elf_main" >&5 -echo "${ECHO_T}$ac_cv_lib_elf_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5 +echo "${ECHO_T}$ac_cv_lib_elf_main" >&6; } if test $ac_cv_lib_elf_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBELF 1 @@ -9588,9 +10242,9 @@ ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -9620,8 +10274,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9638,12 +10291,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + 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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 @@ -9655,13 +10310,12 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9669,77 +10323,29 @@ 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 +/* 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. */ -char opendir (); -int -main () -{ -opendir (); - ; - 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_search_opendir="none required" -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 "$ac_cv_search_opendir" = no; then - for ac_lib in dir; do - LIBS="-l$ac_lib $ac_func_search_save_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 opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + 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=$? @@ -9748,8 +10354,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9761,34 +10366,43 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break + ac_cv_search_opendir=$ac_res 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 - done + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break +fi +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9796,77 +10410,29 @@ 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 +/* 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. */ -char opendir (); -int -main () -{ -opendir (); - ; - 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_search_opendir="none required" -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 "$ac_cv_search_opendir" = no; then - for ac_lib in x; do - LIBS="-l$ac_lib $ac_func_search_save_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 opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + 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=$? @@ -9875,8 +10441,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9888,31 +10453,41 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break + ac_cv_search_opendir=$ac_res 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 - done + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break +fi +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ 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 @@ -9944,8 +10519,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9962,8 +10536,9 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then @@ -10020,6 +10595,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -10039,8 +10615,8 @@ for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext @@ -10063,12 +10639,14 @@ ( 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 +rm -f core *.core core.conftest.* 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 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -10077,8 +10655,8 @@ fi -echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10091,7 +10669,7 @@ #include #include #ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) #endif #ifndef WIFEXITED # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) @@ -10116,8 +10694,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10134,12 +10711,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_sys_wait_h=no + ac_cv_header_sys_wait_h=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then cat >>confdefs.h <<\_ACEOF @@ -10150,8 +10728,8 @@ if test $ac_cv_header_sys_wait_h = no; then - echo "$as_me:$LINENO: checking for sys/wait.h that defines union wait" >&5 -echo $ECHO_N "checking for sys/wait.h that defines union wait... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for sys/wait.h that defines union wait" >&5 +echo $ECHO_N "checking for sys/wait.h that defines union wait... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -10176,8 +10754,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10189,8 +10766,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_WAIT_H 1 _ACEOF @@ -10203,9 +10780,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -10259,18 +10837,19 @@ sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.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 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&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 +{ 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 @@ -10289,8 +10868,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10307,15 +10885,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 +{ 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 @@ -10349,9 +10928,10 @@ 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 +{ 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 @@ -10375,25 +10955,19 @@ 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 the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_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 "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -10406,8 +10980,8 @@ done -echo "$as_me:$LINENO: checking for pthread_np.h" >&5 -echo $ECHO_N "checking for pthread_np.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for pthread_np.h" >&5 +echo $ECHO_N "checking for pthread_np.h... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -10434,8 +11008,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10447,8 +11020,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_PTHREAD_NP_H 1 _ACEOF @@ -10457,27 +11030,29 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext for ac_header in strings.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 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&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 +{ 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 @@ -10496,8 +11071,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10514,15 +11088,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 +{ 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 @@ -10556,9 +11131,10 @@ 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 +{ 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 @@ -10582,25 +11158,19 @@ 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 the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_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 "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -10619,8 +11189,8 @@ else -echo "$as_me:$LINENO: checking if strings.h can be included after string.h" >&5 -echo $ECHO_N "checking if strings.h can be included after string.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if strings.h can be included after string.h" >&5 +echo $ECHO_N "checking if strings.h can be included after string.h... $ECHO_C" >&6; } cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" cat >conftest.$ac_ext <<_ACEOF @@ -10661,8 +11231,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10674,26 +11243,27 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define NO_STRINGS_WITH_STRING_H 1 _ACEOF - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext CPPFLAGS=$cppflags_save fi if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 -echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 +echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; } if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10734,15 +11304,15 @@ fi fi -echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 +echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; } if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10782,6 +11352,7 @@ char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; + if (s) return 0; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; @@ -10800,7 +11371,9 @@ } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + if (!foo) return 0; } + return !x[0] && !zero.x; #endif ; @@ -10816,8 +11389,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10834,12 +11406,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_const=no + ac_cv_c_const=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then cat >>confdefs.h <<\_ACEOF @@ -10848,8 +11421,8 @@ fi -echo "$as_me:$LINENO: checking for mode_t" >&5 -echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for mode_t" >&5 +echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; } if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10860,12 +11433,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef mode_t ac__type_new_; int main () { -if ((mode_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (mode_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; @@ -10880,8 +11454,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10898,12 +11471,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_mode_t=no + ac_cv_type_mode_t=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 +echo "${ECHO_T}$ac_cv_type_mode_t" >&6; } if test $ac_cv_type_mode_t = yes; then : else @@ -10914,8 +11488,8 @@ fi -echo "$as_me:$LINENO: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for off_t" >&5 +echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10926,12 +11500,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef off_t ac__type_new_; int main () { -if ((off_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (off_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; @@ -10946,8 +11521,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10964,24 +11538,25 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_off_t=no + ac_cv_type_off_t=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 +echo "${ECHO_T}$ac_cv_type_off_t" >&6; } if test $ac_cv_type_off_t = yes; then : else cat >>confdefs.h <<_ACEOF -#define off_t long +#define off_t long int _ACEOF fi -echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10992,12 +11567,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef pid_t ac__type_new_; int main () { -if ((pid_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (pid_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; @@ -11012,8 +11588,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11030,12 +11605,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_pid_t=no + ac_cv_type_pid_t=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } if test $ac_cv_type_pid_t = yes; then : else @@ -11046,8 +11622,8 @@ fi -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11058,12 +11634,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef size_t ac__type_new_; int main () { -if ((size_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (size_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; @@ -11078,8 +11655,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11096,24 +11672,25 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no + ac_cv_type_size_t=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; } if test $ac_cv_type_size_t = yes; then : else cat >>confdefs.h <<_ACEOF -#define size_t unsigned +#define size_t unsigned int _ACEOF fi -echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11135,8 +11712,8 @@ rm -f conftest* fi -echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then cat >>confdefs.h <<\_ACEOF @@ -11150,8 +11727,8 @@ fi -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11183,8 +11760,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11201,12 +11777,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_time=no + ac_cv_header_time=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then cat >>confdefs.h <<\_ACEOF @@ -11215,8 +11792,8 @@ fi -echo "$as_me:$LINENO: checking for ino_t" >&5 -echo $ECHO_N "checking for ino_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ino_t" >&5 +echo $ECHO_N "checking for ino_t... $ECHO_C" >&6; } if test "${ac_cv_type_ino_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11227,12 +11804,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef ino_t ac__type_new_; int main () { -if ((ino_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (ino_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; @@ -11247,8 +11825,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11265,12 +11842,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_ino_t=no + ac_cv_type_ino_t=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5 -echo "${ECHO_T}$ac_cv_type_ino_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5 +echo "${ECHO_T}$ac_cv_type_ino_t" >&6; } if test $ac_cv_type_ino_t = yes; then : else @@ -11281,8 +11859,8 @@ fi -echo "$as_me:$LINENO: checking for dev_t" >&5 -echo $ECHO_N "checking for dev_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for dev_t" >&5 +echo $ECHO_N "checking for dev_t... $ECHO_C" >&6; } if test "${ac_cv_type_dev_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11293,12 +11871,13 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef dev_t ac__type_new_; int main () { -if ((dev_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (dev_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; @@ -11313,8 +11892,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11331,12 +11909,13 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_dev_t=no + ac_cv_type_dev_t=no fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5 -echo "${ECHO_T}$ac_cv_type_dev_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5 +echo "${ECHO_T}$ac_cv_type_dev_t" >&6; } if test $ac_cv_type_dev_t = yes; then : else @@ -11348,11 +11927,11 @@ fi -echo "$as_me:$LINENO: checking for rlim_t" >&5 -echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for rlim_t" >&5 +echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6; } if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then - echo "$as_me:$LINENO: result: (cached) $ac_cv_type_rlim_t" >&5 -echo "${ECHO_T}(cached) $ac_cv_type_rlim_t" >&6 + { echo "$as_me:$LINENO: result: (cached) $ac_cv_type_rlim_t" >&5 +echo "${ECHO_T}(cached) $ac_cv_type_rlim_t" >&6; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11379,8 +11958,8 @@ fi rm -f conftest* - echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5 -echo "${ECHO_T}$ac_cv_type_rlim_t" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_type_rlim_t" >&5 +echo "${ECHO_T}$ac_cv_type_rlim_t" >&6; } fi if test $ac_cv_type_rlim_t = no; then cat >> confdefs.h <<\EOF @@ -11388,11 +11967,11 @@ EOF fi -echo "$as_me:$LINENO: checking for stack_t" >&5 -echo $ECHO_N "checking for stack_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for stack_t" >&5 +echo $ECHO_N "checking for stack_t... $ECHO_C" >&6; } if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then - echo "$as_me:$LINENO: result: (cached) $ac_cv_type_stack_t" >&5 -echo "${ECHO_T}(cached) $ac_cv_type_stack_t" >&6 + { echo "$as_me:$LINENO: result: (cached) $ac_cv_type_stack_t" >&5 +echo "${ECHO_T}(cached) $ac_cv_type_stack_t" >&6; } else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11417,8 +11996,8 @@ fi rm -f conftest* - echo "$as_me:$LINENO: result: $ac_cv_type_stack_t" >&5 -echo "${ECHO_T}$ac_cv_type_stack_t" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_type_stack_t" >&5 +echo "${ECHO_T}$ac_cv_type_stack_t" >&6; } fi if test $ac_cv_type_stack_t = no; then cat >> confdefs.h <<\EOF @@ -11426,8 +12005,8 @@ EOF fi -echo "$as_me:$LINENO: checking whether stack_t has an ss_base field" >&5 -echo $ECHO_N "checking whether stack_t has an ss_base field... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stack_t has an ss_base field" >&5 +echo $ECHO_N "checking whether stack_t has an ss_base field... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11460,8 +12039,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11473,8 +12051,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_SS_BASE 1 _ACEOF @@ -11482,26 +12060,27 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext olibs="$LIBS" -echo "$as_me:$LINENO: checking --with-tlib argument" >&5 -echo $ECHO_N "checking --with-tlib argument... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking --with-tlib argument" >&5 +echo $ECHO_N "checking --with-tlib argument... $ECHO_C" >&6; } -# Check whether --with-tlib or --without-tlib was given. +# Check whether --with-tlib was given. if test "${with_tlib+set}" = set; then - withval="$with_tlib" + withval=$with_tlib; +fi -fi; if test -n "$with_tlib"; then - echo "$as_me:$LINENO: result: $with_tlib" >&5 -echo "${ECHO_T}$with_tlib" >&6 + { echo "$as_me:$LINENO: result: $with_tlib" >&5 +echo "${ECHO_T}$with_tlib" >&6; } LIBS="$LIBS -l$with_tlib" - echo "$as_me:$LINENO: checking for linking with $with_tlib library" >&5 -echo $ECHO_N "checking for linking with $with_tlib library... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for linking with $with_tlib library" >&5 +echo $ECHO_N "checking for linking with $with_tlib library... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11526,8 +12105,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11539,22 +12117,23 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: FAILED" >&5 + { { echo "$as_me:$LINENO: error: FAILED" >&5 echo "$as_me: error: FAILED" >&2;} { (exit 1); exit 1; }; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext olibs="$LIBS" else - echo "$as_me:$LINENO: result: empty: automatic terminal library selection" >&5 -echo "${ECHO_T}empty: automatic terminal library selection" >&6 + { echo "$as_me:$LINENO: result: empty: automatic terminal library selection" >&5 +echo "${ECHO_T}empty: automatic terminal library selection" >&6; } case "`uname -s 2>/dev/null`" in OSF1) tlibs="ncurses curses termlib termcap";; *) tlibs="ncurses termlib termcap curses";; @@ -11562,9 +12141,9 @@ for libname in $tlibs; do as_ac_Lib=`echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh` -echo "$as_me:$LINENO: checking for tgetent in -l${libname}" >&5 -echo $ECHO_N "checking for tgetent in -l${libname}... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for tgetent in -l${libname}" >&5 +echo $ECHO_N "checking for tgetent in -l${libname}... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11576,17 +12155,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 tgetent (); int main () { -tgetent (); +return tgetent (); ; return 0; } @@ -11600,8 +12179,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11618,14 +12196,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Lib=no" + eval "$as_ac_Lib=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: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_LIB${libname}" | $as_tr_cpp` 1 @@ -11671,25 +12251,27 @@ ( exit $ac_status ) res="FAIL" fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + if test "$res" = "OK"; then break fi - echo "$as_me:$LINENO: result: $libname library is not usable" >&5 -echo "${ECHO_T}$libname library is not usable" >&6 + { echo "$as_me:$LINENO: result: $libname library is not usable" >&5 +echo "${ECHO_T}$libname library is not usable" >&6; } LIBS="$olibs" fi done if test "x$olibs" = "x$LIBS"; then - echo "$as_me:$LINENO: result: no terminal library found" >&5 -echo "${ECHO_T}no terminal library found" >&6 + { echo "$as_me:$LINENO: result: no terminal library found" >&5 +echo "${ECHO_T}no terminal library found" >&6; } fi fi if test "x$olibs" = "x$LIBS"; then - echo "$as_me:$LINENO: checking for tgetent()" >&5 -echo $ECHO_N "checking for tgetent()... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for tgetent()" >&5 +echo $ECHO_N "checking for tgetent()... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11714,8 +12296,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11727,13 +12308,13 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: NOT FOUND! + { { echo "$as_me:$LINENO: error: NOT FOUND! You need to install a terminal library; for example ncurses. Or specify the name of the library with --with-tlib." >&5 echo "$as_me: error: NOT FOUND! @@ -11741,12 +12322,13 @@ Or specify the name of the library with --with-tlib." >&2;} { (exit 1); exit 1; }; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: checking whether we talk terminfo" >&5 -echo $ECHO_N "checking whether we talk terminfo... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we talk terminfo" >&5 +echo $ECHO_N "checking whether we talk terminfo... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: failed to compile test program." >&5 echo "$as_me: error: failed to compile test program." >&2;} @@ -11776,26 +12358,28 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: no -- we are in termcap land" >&5 -echo "${ECHO_T}no -- we are in termcap land" >&6 + { echo "$as_me:$LINENO: result: no -- we are in termcap land" >&5 +echo "${ECHO_T}no -- we are in termcap land" >&6; } 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: result: yes -- terminfo spoken here" >&5 -echo "${ECHO_T}yes -- terminfo spoken here" >&6; cat >>confdefs.h <<\_ACEOF +{ echo "$as_me:$LINENO: result: yes -- terminfo spoken here" >&5 +echo "${ECHO_T}yes -- terminfo spoken here" >&6; }; cat >>confdefs.h <<\_ACEOF #define TERMINFO 1 _ACEOF fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + if test "x$olibs" != "x$LIBS"; then - echo "$as_me:$LINENO: checking what tgetent() returns for an unknown terminal" >&5 -echo $ECHO_N "checking what tgetent() returns for an unknown terminal... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking what tgetent() returns for an unknown terminal" >&5 +echo $ECHO_N "checking what tgetent() returns for an unknown terminal... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: failed to compile test program." >&5 echo "$as_me: error: failed to compile test program." >&2;} @@ -11825,8 +12409,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: zero" >&5 -echo "${ECHO_T}zero" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: zero" >&5 +echo "${ECHO_T}zero" >&6; }; cat >>confdefs.h <<\_ACEOF #define TGETENT_ZERO_ERR 0 _ACEOF @@ -11836,15 +12420,17 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -echo "$as_me:$LINENO: result: non-zero" >&5 -echo "${ECHO_T}non-zero" >&6 +{ echo "$as_me:$LINENO: result: non-zero" >&5 +echo "${ECHO_T}non-zero" >&6; } fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: checking whether termcap.h contains ospeed" >&5 -echo $ECHO_N "checking whether termcap.h contains ospeed... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether termcap.h contains ospeed" >&5 +echo $ECHO_N "checking whether termcap.h contains ospeed... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11873,8 +12459,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11886,8 +12471,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_OSPEED 1 _ACEOF @@ -11895,10 +12480,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - echo "$as_me:$LINENO: checking whether ospeed can be extern" >&5 -echo $ECHO_N "checking whether ospeed can be extern... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking whether ospeed can be extern" >&5 +echo $ECHO_N "checking whether ospeed can be extern... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11928,8 +12513,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -11941,8 +12525,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define OSPEED_EXTERN 1 _ACEOF @@ -11950,18 +12534,20 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: checking whether termcap.h contains UP, BC and PC" >&5 -echo $ECHO_N "checking whether termcap.h contains UP, BC and PC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether termcap.h contains UP, BC and PC" >&5 +echo $ECHO_N "checking whether termcap.h contains UP, BC and PC... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11990,8 +12576,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12003,8 +12588,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_UP_BC_PC 1 _ACEOF @@ -12012,10 +12597,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - echo "$as_me:$LINENO: checking whether UP, BC and PC can be extern" >&5 -echo $ECHO_N "checking whether UP, BC and PC can be extern... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking whether UP, BC and PC can be extern" >&5 +echo $ECHO_N "checking whether UP, BC and PC can be extern... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12045,8 +12630,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12058,8 +12642,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define UP_BC_PC_EXTERN 1 _ACEOF @@ -12067,18 +12651,20 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: checking whether tputs() uses outfuntype" >&5 -echo $ECHO_N "checking whether tputs() uses outfuntype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether tputs() uses outfuntype" >&5 +echo $ECHO_N "checking whether tputs() uses outfuntype... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12107,8 +12693,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12120,8 +12705,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_OUTFUNTYPE 1 _ACEOF @@ -12129,13 +12714,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking whether sys/select.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether sys/select.h and sys/time.h may both be included... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether sys/select.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether sys/select.h and sys/time.h may both be included... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12163,8 +12749,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12176,8 +12761,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define SYS_SELECT_WITH_SYS_TIME 1 _ACEOF @@ -12186,28 +12771,29 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking for /dev/ptc" >&5 -echo $ECHO_N "checking for /dev/ptc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for /dev/ptc" >&5 +echo $ECHO_N "checking for /dev/ptc... $ECHO_C" >&6; } if test -r /dev/ptc; then cat >>confdefs.h <<\_ACEOF #define HAVE_DEV_PTC 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { 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 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking for SVR4 ptys" >&5 -echo $ECHO_N "checking for SVR4 ptys... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for SVR4 ptys" >&5 +echo $ECHO_N "checking for SVR4 ptys... $ECHO_C" >&6; } if test -c /dev/ptmx ; then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -12233,8 +12819,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12246,8 +12831,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_SVR4_PTYS 1 _ACEOF @@ -12255,18 +12840,19 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking for ptyranges" >&5 -echo $ECHO_N "checking for ptyranges... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ptyranges" >&5 +echo $ECHO_N "checking for ptyranges... $ECHO_C" >&6; } if test -d /dev/ptym ; then pdir='/dev/ptym' else @@ -12302,15 +12888,15 @@ #define PTYRANGE1 "$p1" _ACEOF - echo "$as_me:$LINENO: result: $p0 / $p1" >&5 -echo "${ECHO_T}$p0 / $p1" >&6 + { echo "$as_me:$LINENO: result: $p0 / $p1" >&5 +echo "${ECHO_T}$p0 / $p1" >&6; } else - echo "$as_me:$LINENO: result: don't know" >&5 -echo "${ECHO_T}don't know" >&6 + { echo "$as_me:$LINENO: result: don't know" >&5 +echo "${ECHO_T}don't know" >&6; } fi -echo "$as_me:$LINENO: checking default tty permissions/group" >&5 -echo $ECHO_N "checking default tty permissions/group... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking default tty permissions/group" >&5 +echo $ECHO_N "checking default tty permissions/group... $ECHO_C" >&6; } rm -f conftest_grp if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: failed to compile test program" >&5 @@ -12367,8 +12953,8 @@ if test -f conftest_grp; then ptygrp=`cat conftest_grp` - echo "$as_me:$LINENO: result: pty mode: 0620, group: $ptygrp" >&5 -echo "${ECHO_T}pty mode: 0620, group: $ptygrp" >&6 + { echo "$as_me:$LINENO: result: pty mode: 0620, group: $ptygrp" >&5 +echo "${ECHO_T}pty mode: 0620, group: $ptygrp" >&6; } cat >>confdefs.h <<\_ACEOF #define PTYMODE 0620 _ACEOF @@ -12378,8 +12964,8 @@ _ACEOF else - echo "$as_me:$LINENO: result: ptys are world accessable" >&5 -echo "${ECHO_T}ptys are world accessable" >&6 + { echo "$as_me:$LINENO: result: ptys are world accessable" >&5 +echo "${ECHO_T}ptys are world accessable" >&6; } fi else @@ -12388,16 +12974,18 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5 -echo "${ECHO_T}can't determine - assume ptys are world accessable" >&6 +{ echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5 +echo "${ECHO_T}can't determine - assume ptys are world accessable" >&6; } fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + rm -f conftest_grp -echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12409,19 +12997,11 @@ /* end confdefs.h. */ #include #include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif int main () { -int i; +return *(signal (0, 0)) (0) == 1; ; return 0; } @@ -12435,8 +13015,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12448,17 +13027,18 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_signal=void + ac_cv_type_signal=int else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_signal=int + ac_cv_type_signal=void fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal @@ -12478,8 +13058,8 @@ fi -echo "$as_me:$LINENO: checking for struct sigcontext" >&5 -echo $ECHO_N "checking for struct sigcontext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct sigcontext" >&5 +echo $ECHO_N "checking for struct sigcontext... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12511,8 +13091,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12524,8 +13103,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_SIGCONTEXT 1 _ACEOF @@ -12534,13 +13113,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking getcwd implementation" >&5 -echo $ECHO_N "checking getcwd implementation... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking getcwd implementation" >&5 +echo $ECHO_N "checking getcwd implementation... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: failed to compile test program" >&5 echo "$as_me: error: failed to compile test program" >&2;} @@ -12573,22 +13153,22 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: it is usable" >&5 -echo "${ECHO_T}it is usable" >&6 + { echo "$as_me:$LINENO: result: it is usable" >&5 +echo "${ECHO_T}it is usable" >&6; } 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: result: it stinks" >&5 -echo "${ECHO_T}it stinks" >&6 +{ echo "$as_me:$LINENO: result: it stinks" >&5 +echo "${ECHO_T}it stinks" >&6; } cat >>confdefs.h <<\_ACEOF #define BAD_GETCWD 1 _ACEOF fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -12637,6 +13217,8 @@ + + for ac_func in bcmp fchdir fchown fseeko fsync ftello getcwd getpseudotty \ getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \ memset nanosleep opendir putenv qsort readlink select setenv \ @@ -12646,9 +13228,9 @@ usleep utime utimes 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -12674,30 +13256,24 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 $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) +#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 $ac_func (); ; return 0; } @@ -12711,8 +13287,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12729,13 +13304,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -12745,8 +13322,8 @@ done -echo "$as_me:$LINENO: checking for st_blksize" >&5 -echo $ECHO_N "checking for st_blksize... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for st_blksize" >&5 +echo $ECHO_N "checking for st_blksize... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12776,8 +13353,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12789,8 +13365,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_ST_BLKSIZE 1 _ACEOF @@ -12798,13 +13374,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking whether stat() ignores a trailing slash" >&5 -echo $ECHO_N "checking whether stat() ignores a trailing slash... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stat() ignores a trailing slash" >&5 +echo $ECHO_N "checking whether stat() ignores a trailing slash... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then { { echo "$as_me:$LINENO: error: failed to compile test program" >&5 echo "$as_me: error: failed to compile test program" >&2;} @@ -12831,8 +13408,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define STAT_IGNORES_SLASH 1 _ACEOF @@ -12842,14 +13419,16 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 +{ echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: checking for iconv_open()" >&5 -echo $ECHO_N "checking for iconv_open()... $ECHO_C" >&6 + + +{ echo "$as_me:$LINENO: checking for iconv_open()" >&5 +echo $ECHO_N "checking for iconv_open()... $ECHO_C" >&6; } save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat >conftest.$ac_ext <<_ACEOF @@ -12880,8 +13459,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12893,8 +13471,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes; with -liconv" >&5 -echo "${ECHO_T}yes; with -liconv" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes; with -liconv" >&5 +echo "${ECHO_T}yes; with -liconv" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_ICONV 1 _ACEOF @@ -12902,7 +13480,7 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LIBS="$save_LIBS" + LIBS="$save_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12931,8 +13509,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12944,8 +13521,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_ICONV 1 _ACEOF @@ -12953,18 +13530,20 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: checking for nl_langinfo(CODESET)" >&5 -echo $ECHO_N "checking for nl_langinfo(CODESET)... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for nl_langinfo(CODESET)" >&5 +echo $ECHO_N "checking for nl_langinfo(CODESET)... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12993,8 +13572,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13006,8 +13584,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_NL_LANGINFO_CODESET 1 _ACEOF @@ -13015,26 +13593,27 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: checking --disable-acl argument" >&5 -echo $ECHO_N "checking --disable-acl argument... $ECHO_C" >&6 -# Check whether --enable-acl or --disable-acl was given. +{ echo "$as_me:$LINENO: checking --disable-acl argument" >&5 +echo $ECHO_N "checking --disable-acl argument... $ECHO_C" >&6; } +# Check whether --enable-acl was given. if test "${enable_acl+set}" = set; then - enableval="$enable_acl" - + enableval=$enable_acl; else enable_acl="yes" -fi; +fi + if test "$enable_acl" = "yes"; then -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -echo "$as_me:$LINENO: checking for acl_get_file in -lposix1e" >&5 -echo $ECHO_N "checking for acl_get_file in -lposix1e... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +{ echo "$as_me:$LINENO: checking for acl_get_file in -lposix1e" >&5 +echo $ECHO_N "checking for acl_get_file in -lposix1e... $ECHO_C" >&6; } if test "${ac_cv_lib_posix1e_acl_get_file+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13047,17 +13626,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 acl_get_file (); int main () { -acl_get_file (); +return acl_get_file (); ; return 0; } @@ -13071,8 +13650,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13089,19 +13667,20 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_posix1e_acl_get_file=no + ac_cv_lib_posix1e_acl_get_file=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_posix1e_acl_get_file" >&5 -echo "${ECHO_T}$ac_cv_lib_posix1e_acl_get_file" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5 +echo "${ECHO_T}$ac_cv_lib_posix1e_acl_get_file" >&6; } if test $ac_cv_lib_posix1e_acl_get_file = yes; then LIBS="$LIBS -lposix1e" else - echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 -echo $ECHO_N "checking for acl_get_file in -lacl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 +echo $ECHO_N "checking for acl_get_file in -lacl... $ECHO_C" >&6; } if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13114,17 +13693,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 acl_get_file (); int main () { -acl_get_file (); +return acl_get_file (); ; return 0; } @@ -13138,8 +13717,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13156,18 +13734,19 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_acl_acl_get_file=no + ac_cv_lib_acl_acl_get_file=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_acl_acl_get_file" >&5 -echo "${ECHO_T}$ac_cv_lib_acl_acl_get_file" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5 +echo "${ECHO_T}$ac_cv_lib_acl_acl_get_file" >&6; } if test $ac_cv_lib_acl_acl_get_file = yes; then LIBS="$LIBS -lacl" - echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5 -echo $ECHO_N "checking for fgetxattr in -lattr... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5 +echo $ECHO_N "checking for fgetxattr in -lattr... $ECHO_C" >&6; } if test "${ac_cv_lib_attr_fgetxattr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13180,17 +13759,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 fgetxattr (); int main () { -fgetxattr (); +return fgetxattr (); ; return 0; } @@ -13204,8 +13783,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13222,14 +13800,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_attr_fgetxattr=no + ac_cv_lib_attr_fgetxattr=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_attr_fgetxattr" >&5 -echo "${ECHO_T}$ac_cv_lib_attr_fgetxattr" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5 +echo "${ECHO_T}$ac_cv_lib_attr_fgetxattr" >&6; } if test $ac_cv_lib_attr_fgetxattr = yes; then LIBS="$LIBS -lattr" fi @@ -13239,8 +13818,8 @@ fi -echo "$as_me:$LINENO: checking for POSIX ACL support" >&5 -echo $ECHO_N "checking for POSIX ACL support... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for POSIX ACL support" >&5 +echo $ECHO_N "checking for POSIX ACL support... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13272,8 +13851,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13285,8 +13863,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_POSIX_ACL 1 _ACEOF @@ -13294,14 +13872,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: checking for Solaris ACL support" >&5 -echo $ECHO_N "checking for Solaris ACL support... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for Solaris ACL support" >&5 +echo $ECHO_N "checking for Solaris ACL support... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13330,8 +13909,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13343,8 +13921,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_SOLARIS_ACL 1 _ACEOF @@ -13352,14 +13930,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: checking for AIX ACL support" >&5 -echo $ECHO_N "checking for AIX ACL support... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for AIX ACL support" >&5 +echo $ECHO_N "checking for AIX ACL support... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13399,8 +13978,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13412,8 +13990,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_AIX_ACL 1 _ACEOF @@ -13421,31 +13999,32 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi -echo "$as_me:$LINENO: checking --disable-gpm argument" >&5 -echo $ECHO_N "checking --disable-gpm argument... $ECHO_C" >&6 -# Check whether --enable-gpm or --disable-gpm was given. +{ echo "$as_me:$LINENO: checking --disable-gpm argument" >&5 +echo $ECHO_N "checking --disable-gpm argument... $ECHO_C" >&6; } +# Check whether --enable-gpm was given. if test "${enable_gpm+set}" = set; then - enableval="$enable_gpm" - + enableval=$enable_gpm; else enable_gpm="yes" -fi; +fi + if test "$enable_gpm" = "yes"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - echo "$as_me:$LINENO: checking for gpm" >&5 -echo $ECHO_N "checking for gpm... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: checking for gpm" >&5 +echo $ECHO_N "checking for gpm... $ECHO_C" >&6; } if test "${vi_cv_have_gpm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13475,8 +14054,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13493,15 +14071,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -vi_cv_have_gpm=no + vi_cv_have_gpm=no fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$olibs" fi -echo "$as_me:$LINENO: result: $vi_cv_have_gpm" >&5 -echo "${ECHO_T}$vi_cv_have_gpm" >&6 +{ echo "$as_me:$LINENO: result: $vi_cv_have_gpm" >&5 +echo "${ECHO_T}$vi_cv_have_gpm" >&6; } if test $vi_cv_have_gpm = yes; then LIBS="$LIBS -lgpm" cat >>confdefs.h <<\_ACEOF @@ -13510,12 +14089,12 @@ fi else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi -echo "$as_me:$LINENO: checking for rename" >&5 -echo $ECHO_N "checking for rename... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for rename" >&5 +echo $ECHO_N "checking for rename... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13540,8 +14119,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13553,8 +14131,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_RENAME 1 _ACEOF @@ -13562,14 +14140,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -echo "$as_me:$LINENO: checking for sysctl" >&5 -echo $ECHO_N "checking for sysctl... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sysctl" >&5 +echo $ECHO_N "checking for sysctl... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13602,8 +14181,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13615,8 +14193,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_SYSCTL 1 _ACEOF @@ -13624,13 +14202,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: not usable" >&5 -echo "${ECHO_T}not usable" >&6 + { echo "$as_me:$LINENO: result: not usable" >&5 +echo "${ECHO_T}not usable" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking for sysinfo" >&5 -echo $ECHO_N "checking for sysinfo... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sysinfo" >&5 +echo $ECHO_N "checking for sysinfo... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13661,8 +14240,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13674,8 +14252,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_SYSINFO 1 _ACEOF @@ -13683,13 +14261,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: not usable" >&5 -echo "${ECHO_T}not usable" >&6 + { echo "$as_me:$LINENO: result: not usable" >&5 +echo "${ECHO_T}not usable" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking for sysconf" >&5 -echo $ECHO_N "checking for sysconf... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sysconf" >&5 +echo $ECHO_N "checking for sysconf... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13716,8 +14295,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13729,8 +14307,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_SYSCONF 1 _ACEOF @@ -13738,14 +14316,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: not usable" >&5 -echo "${ECHO_T}not usable" >&6 + { echo "$as_me:$LINENO: result: not usable" >&5 +echo "${ECHO_T}not usable" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6; } if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13789,19 +14368,21 @@ ( exit $ac_status ) ac_cv_sizeof_int=0 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; } cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int _ACEOF -echo "$as_me:$LINENO: checking whether memmove/bcopy/memcpy handle overlaps" >&5 -echo $ECHO_N "checking whether memmove/bcopy/memcpy handle overlaps... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether memmove/bcopy/memcpy handle overlaps" >&5 +echo $ECHO_N "checking whether memmove/bcopy/memcpy handle overlaps... $ECHO_C" >&6; } bcopy_test_prog=' main() { char buf[10]; @@ -13844,8 +14425,8 @@ cat >>confdefs.h <<\_ACEOF #define USEMEMMOVE 1 _ACEOF - echo "$as_me:$LINENO: result: memmove does" >&5 -echo "${ECHO_T}memmove does" >&6 + { echo "$as_me:$LINENO: result: memmove does" >&5 +echo "${ECHO_T}memmove does" >&6; } else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 @@ -13879,8 +14460,8 @@ cat >>confdefs.h <<\_ACEOF #define USEBCOPY 1 _ACEOF - echo "$as_me:$LINENO: result: bcopy does" >&5 -echo "${ECHO_T}bcopy does" >&6 + { echo "$as_me:$LINENO: result: bcopy does" >&5 +echo "${ECHO_T}bcopy does" >&6; } else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 @@ -13914,35 +14495,41 @@ cat >>confdefs.h <<\_ACEOF #define USEMEMCPY 1 _ACEOF - echo "$as_me:$LINENO: result: memcpy does" >&5 -echo "${ECHO_T}memcpy does" >&6 + { echo "$as_me:$LINENO: result: memcpy does" >&5 +echo "${ECHO_T}memcpy does" >&6; } 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: result: no" >&5 -echo "${ECHO_T}no" >&6 +{ echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + if test "$enable_multibyte" = "yes"; then cflags_save=$CFLAGS ldflags_save=$LDFLAGS if test -n "$x_includes" ; then CFLAGS="$CFLAGS -I$x_includes" LDFLAGS="$X_LIBS $LDFLAGS -lX11" - echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5 -echo $ECHO_N "checking whether X_LOCALE needed... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5 +echo $ECHO_N "checking whether X_LOCALE needed... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13967,8 +14554,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -13987,17 +14573,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 _Xsetlocale (); int main () { -_Xsetlocale (); +return _Xsetlocale (); ; return 0; } @@ -14011,8 +14597,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14024,8 +14609,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define X_LOCALE 1 _ACEOF @@ -14034,26 +14619,28 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi CFLAGS=$cflags_save LDFLAGS=$ldflags_save fi -echo "$as_me:$LINENO: checking for _xpg4_setrunelocale in -lxpg4" >&5 -echo $ECHO_N "checking for _xpg4_setrunelocale in -lxpg4... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for _xpg4_setrunelocale in -lxpg4" >&5 +echo $ECHO_N "checking for _xpg4_setrunelocale in -lxpg4... $ECHO_C" >&6; } if test "${ac_cv_lib_xpg4__xpg4_setrunelocale+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14066,17 +14653,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 _xpg4_setrunelocale (); int main () { -_xpg4_setrunelocale (); +return _xpg4_setrunelocale (); ; return 0; } @@ -14090,8 +14677,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14108,21 +14694,22 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_xpg4__xpg4_setrunelocale=no + ac_cv_lib_xpg4__xpg4_setrunelocale=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_xpg4__xpg4_setrunelocale" >&5 -echo "${ECHO_T}$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 +echo "${ECHO_T}$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; } if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then LIBS="$LIBS -lxpg4" fi -echo "$as_me:$LINENO: checking how to create tags" >&5 -echo $ECHO_N "checking how to create tags... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to create tags" >&5 +echo $ECHO_N "checking how to create tags... $ECHO_C" >&6; } test -f tags && mv tags tags.save if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then TAGPRG="ctags -I INIT+ --fields=+S" @@ -14136,15 +14723,15 @@ (eval ctags -i+m /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="ctags -i+m" fi test -f tags.save && mv tags.save tags -echo "$as_me:$LINENO: result: $TAGPRG" >&5 -echo "${ECHO_T}$TAGPRG" >&6 +{ echo "$as_me:$LINENO: result: $TAGPRG" >&5 +echo "${ECHO_T}$TAGPRG" >&6; } -echo "$as_me:$LINENO: checking how to run man with a section nr" >&5 -echo $ECHO_N "checking how to run man with a section nr... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run man with a section nr" >&5 +echo $ECHO_N "checking how to run man with a section nr... $ECHO_C" >&6; } MANDEF="man" (eval man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s" -echo "$as_me:$LINENO: result: $MANDEF" >&5 -echo "${ECHO_T}$MANDEF" >&6 +{ echo "$as_me:$LINENO: result: $MANDEF" >&5 +echo "${ECHO_T}$MANDEF" >&6; } if test "$MANDEF" = "man -s"; then cat >>confdefs.h <<\_ACEOF #define USEMAN_S 1 @@ -14152,19 +14739,19 @@ fi -echo "$as_me:$LINENO: checking --disable-nls argument" >&5 -echo $ECHO_N "checking --disable-nls argument... $ECHO_C" >&6 -# Check whether --enable-nls or --disable-nls was given. +{ echo "$as_me:$LINENO: checking --disable-nls argument" >&5 +echo $ECHO_N "checking --disable-nls argument... $ECHO_C" >&6; } +# Check whether --enable-nls was given. if test "${enable_nls+set}" = set; then - enableval="$enable_nls" - + enableval=$enable_nls; else enable_nls="yes" -fi; +fi + if test "$enable_nls" = "yes"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } INSTALL_LANGS=install-languages @@ -14173,8 +14760,8 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14187,27 +14774,29 @@ 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 -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_MSGFMT="msgfmt" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi MSGFMT=$ac_cv_prog_MSGFMT if test -n "$MSGFMT"; then - echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 + { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - echo "$as_me:$LINENO: checking for NLS" >&5 -echo $ECHO_N "checking for NLS... $ECHO_C" >&6 + + { echo "$as_me:$LINENO: checking for NLS" >&5 +echo $ECHO_N "checking for NLS... $ECHO_C" >&6; } if test -f po/Makefile; then have_gettext="no" if test -n "$MSGFMT"; then @@ -14235,8 +14824,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14248,13 +14836,13 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: gettext() works" >&5 -echo "${ECHO_T}gettext() works" >&6; have_gettext="yes" + { echo "$as_me:$LINENO: result: gettext() works" >&5 +echo "${ECHO_T}gettext() works" >&6; }; have_gettext="yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -olibs=$LIBS + olibs=$LIBS LIBS="$LIBS -lintl" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -14280,8 +14868,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14293,24 +14880,26 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: gettext() works with -lintl" >&5 -echo "${ECHO_T}gettext() works with -lintl" >&6; have_gettext="yes" + { echo "$as_me:$LINENO: result: gettext() works with -lintl" >&5 +echo "${ECHO_T}gettext() works with -lintl" >&6; }; have_gettext="yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: gettext() doesn't work" >&5 -echo "${ECHO_T}gettext() doesn't work" >&6; + { echo "$as_me:$LINENO: result: gettext() doesn't work" >&5 +echo "${ECHO_T}gettext() doesn't work" >&6; }; LIBS=$olibs fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext else - echo "$as_me:$LINENO: result: msgfmt not found - disabled" >&5 -echo "${ECHO_T}msgfmt not found - disabled" >&6; + { echo "$as_me:$LINENO: result: msgfmt not found - disabled" >&5 +echo "${ECHO_T}msgfmt not found - disabled" >&6; }; fi if test $have_gettext = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -14323,9 +14912,9 @@ for ac_func in bind_textdomain_codeset 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 "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14351,30 +14940,24 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* 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 $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) +#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 $ac_func (); ; return 0; } @@ -14388,8 +14971,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14406,13 +14988,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + 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 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -14421,8 +15005,8 @@ fi done - echo "$as_me:$LINENO: checking for _nl_msg_cat_cntr" >&5 -echo $ECHO_N "checking for _nl_msg_cat_cntr... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _nl_msg_cat_cntr" >&5 +echo $ECHO_N "checking for _nl_msg_cat_cntr... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14448,8 +15032,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14461,8 +15044,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_NL_MSG_CAT_CNTR 1 _ACEOF @@ -14470,33 +15053,34 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi else - echo "$as_me:$LINENO: result: no \"po/Makefile\" - disabled" >&5 -echo "${ECHO_T}no \"po/Makefile\" - disabled" >&6; + { echo "$as_me:$LINENO: result: no \"po/Makefile\" - disabled" >&5 +echo "${ECHO_T}no \"po/Makefile\" - disabled" >&6; }; fi else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi if test "${ac_cv_header_dlfcn_h+set}" = set; then - echo "$as_me:$LINENO: checking for dlfcn.h" >&5 -echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlfcn.h" >&5 +echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; } if test "${ac_cv_header_dlfcn_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5 -echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5 +echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking dlfcn.h usability" >&5 -echo $ECHO_N "checking dlfcn.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dlfcn.h usability" >&5 +echo $ECHO_N "checking dlfcn.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14515,8 +15099,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14533,15 +15116,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 dlfcn.h presence" >&5 -echo $ECHO_N "checking dlfcn.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dlfcn.h presence" >&5 +echo $ECHO_N "checking dlfcn.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14575,9 +15159,10 @@ 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 +{ 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 @@ -14601,42 +15186,35 @@ echo "$as_me: WARNING: dlfcn.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for dlfcn.h" >&5 -echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for dlfcn.h" >&5 +echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6; } if test "${ac_cv_header_dlfcn_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_dlfcn_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5 -echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5 +echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6; } fi if test $ac_cv_header_dlfcn_h = yes; then DLL=dlfcn.h else if test "${ac_cv_header_dl_h+set}" = set; then - echo "$as_me:$LINENO: checking for dl.h" >&5 -echo $ECHO_N "checking for dl.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dl.h" >&5 +echo $ECHO_N "checking for dl.h... $ECHO_C" >&6; } if test "${ac_cv_header_dl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5 -echo "${ECHO_T}$ac_cv_header_dl_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5 +echo "${ECHO_T}$ac_cv_header_dl_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking dl.h usability" >&5 -echo $ECHO_N "checking dl.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dl.h usability" >&5 +echo $ECHO_N "checking dl.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14655,8 +15233,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14673,15 +15250,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 dl.h presence" >&5 -echo $ECHO_N "checking dl.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dl.h presence" >&5 +echo $ECHO_N "checking dl.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14715,9 +15293,10 @@ 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 +{ 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 @@ -14741,25 +15320,18 @@ echo "$as_me: WARNING: dl.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: dl.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: dl.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for dl.h" >&5 -echo $ECHO_N "checking for dl.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for dl.h" >&5 +echo $ECHO_N "checking for dl.h... $ECHO_C" >&6; } if test "${ac_cv_header_dl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_dl_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5 -echo "${ECHO_T}$ac_cv_header_dl_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_dl_h" >&5 +echo "${ECHO_T}$ac_cv_header_dl_h" >&6; } fi if test $ac_cv_header_dl_h = yes; then @@ -14776,8 +15348,8 @@ #define HAVE_DLFCN_H 1 _ACEOF - echo "$as_me:$LINENO: checking for dlopen()" >&5 -echo $ECHO_N "checking for dlopen()... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen()" >&5 +echo $ECHO_N "checking for dlopen()... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14805,8 +15377,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14818,8 +15389,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_DLOPEN 1 @@ -14829,10 +15400,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; - echo "$as_me:$LINENO: checking for dlopen() in -ldl" >&5 -echo $ECHO_N "checking for dlopen() in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; + { echo "$as_me:$LINENO: checking for dlopen() in -ldl" >&5 +echo $ECHO_N "checking for dlopen() in -ldl... $ECHO_C" >&6; } olibs=$LIBS LIBS="$LIBS -ldl" cat >conftest.$ac_ext <<_ACEOF @@ -14862,8 +15433,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14875,8 +15445,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_DLOPEN 1 @@ -14886,17 +15456,19 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; LIBS=$olibs fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - echo "$as_me:$LINENO: checking for dlsym()" >&5 -echo $ECHO_N "checking for dlsym()... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlsym()" >&5 +echo $ECHO_N "checking for dlsym()... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14924,8 +15496,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14937,8 +15508,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_DLSYM 1 @@ -14948,10 +15519,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; - echo "$as_me:$LINENO: checking for dlsym() in -ldl" >&5 -echo $ECHO_N "checking for dlsym() in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; + { echo "$as_me:$LINENO: checking for dlsym() in -ldl" >&5 +echo $ECHO_N "checking for dlsym() in -ldl... $ECHO_C" >&6; } olibs=$LIBS LIBS="$LIBS -ldl" cat >conftest.$ac_ext <<_ACEOF @@ -14981,8 +15552,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -14994,8 +15564,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_DLSYM 1 @@ -15005,13 +15575,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; LIBS=$olibs fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext elif test x${DLL} = xdl.h; then @@ -15020,8 +15592,8 @@ #define HAVE_DL_H 1 _ACEOF - echo "$as_me:$LINENO: checking for shl_load()" >&5 -echo $ECHO_N "checking for shl_load()... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load()" >&5 +echo $ECHO_N "checking for shl_load()... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15049,8 +15621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15062,8 +15633,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_SHL_LOAD 1 @@ -15073,10 +15644,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; - echo "$as_me:$LINENO: checking for shl_load() in -ldld" >&5 -echo $ECHO_N "checking for shl_load() in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; + { echo "$as_me:$LINENO: checking for shl_load() in -ldld" >&5 +echo $ECHO_N "checking for shl_load() in -ldld... $ECHO_C" >&6; } olibs=$LIBS LIBS="$LIBS -ldld" cat >conftest.$ac_ext <<_ACEOF @@ -15106,8 +15677,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15119,8 +15689,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_SHL_LOAD 1 @@ -15130,13 +15700,15 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; }; LIBS=$olibs fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi + rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi @@ -15144,18 +15716,19 @@ for ac_header in setjmp.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 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&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 +{ 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 @@ -15174,8 +15747,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15192,15 +15764,16 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + 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 +{ 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 +{ 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 @@ -15234,9 +15807,10 @@ 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 +{ 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 @@ -15260,25 +15834,19 @@ 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 the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_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 "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+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 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -15300,24 +15868,24 @@ if test "x$MACOSX" = "xyes" && test "x$CARBON" = "xyes" \ && test "x$GUITYPE" != "xCARBONGUI"; then - echo "$as_me:$LINENO: checking whether we need -framework Carbon" >&5 -echo $ECHO_N "checking whether we need -framework Carbon... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether we need -framework Carbon" >&5 +echo $ECHO_N "checking whether we need -framework Carbon... $ECHO_C" >&6; } if test "x$enable_multibyte" = "xyes" || test "x$features" == "xbig" \ || test "x$features" = "xhuge"; then LIBS="$LIBS -framework Carbon" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { 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 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi if test "x$MACARCH" = "xboth"; then LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" fi -echo "$as_me:$LINENO: checking for GCC 3 or later" >&5 -echo $ECHO_N "checking for GCC 3 or later... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for GCC 3 or later" >&5 +echo $ECHO_N "checking for GCC 3 or later... $ECHO_C" >&6; } DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'` @@ -15326,15 +15894,16 @@ fi fi if test "$DEPEND_CFLAGS_FILTER" = ""; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi - ac_config_files="$ac_config_files auto/config.mk:config.mk.in" +ac_config_files="$ac_config_files auto/config.mk:config.mk.in" + 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 @@ -15353,39 +15922,58 @@ # 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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_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=\ *) # `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" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + 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 + 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" + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -15394,32 +15982,18 @@ # 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=`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. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -15457,11 +16031,35 @@ # Zsh 3.x and 4.x performs 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 + 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 + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +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 + # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset @@ -15470,8 +16068,43 @@ 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.) +as_nl=' +' +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 + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -15485,18 +16118,19 @@ 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 + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +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 @@ -15504,159 +16138,120 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -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 +# CDPATH. +$as_unset CDPATH - 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 + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # 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. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, 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 | + # scripts with optimization help from Paolo Bonzini. 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:$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;} + chmod +x "$as_me.lineno" || + { 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 + # 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= ;; +if (dirname -- /) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi 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 + 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' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln 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=: @@ -15665,7 +16260,19 @@ as_mkdir_p=false fi -as_executable_p="test -f" +# Find out whether ``test -x'' works. Don't use a zero-byte file, as +# systems may use methods other than mode bits to determine executability. +cat >conf$$.file <<_ASEOF +#! /bin/sh +exit 0 +_ASEOF +chmod +x conf$$.file +if test -x conf$$.file >/dev/null 2>&1; then + as_executable_p="test -x" +else + as_executable_p=: +fi +rm -f conf$$.file # 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'" @@ -15674,31 +16281,14 @@ 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 +# 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>>auto/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 $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.59d. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15706,30 +16296,19 @@ CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # 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 +config_files="$ac_config_files" +config_headers="$ac_config_headers" -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -15753,18 +16332,20 @@ $config_headers Report bugs to ." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, +configured by $0, generated by GNU Autoconf 2.59d, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 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 + +ac_pwd='$ac_pwd' +srcdir='$srcdir' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -15775,39 +16356,24 @@ 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 ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -15817,18 +16383,24 @@ $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { 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 ;; -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;} + -*) { 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" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -15844,29 +16416,43 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF 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 + echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>auto/config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 - - - +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "auto/config.mk" ) CONFIG_FILES="$CONFIG_FILES auto/config.mk:config.mk.in" ;; - "auto/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS auto/config.h:config.h.in" ;; + case $ac_config_target in + "auto/config.h") CONFIG_HEADERS="$CONFIG_HEADERS auto/config.h:config.h.in" ;; + "auto/config.mk") CONFIG_FILES="$CONFIG_FILES auto/config.mk:config.mk.in" ;; + *) { { 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 + # 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. # We use the long form for the default assignment because of an extremely @@ -15877,373 +16463,488 @@ 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 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); 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) + tmp=./conf$$-$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. +# Set up the sed scripts for 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,@SET_MAKE@,$SET_MAKE,;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,@CPP@,$CPP,;t t -s,@EGREP@,$EGREP,;t t -s,@AWK@,$AWK,;t t -s,@STRIP@,$STRIP,;t t -s,@CPP_MM@,$CPP_MM,;t t -s,@OS_EXTRA_SRC@,$OS_EXTRA_SRC,;t t -s,@OS_EXTRA_OBJ@,$OS_EXTRA_OBJ,;t t -s,@VIMNAME@,$VIMNAME,;t t -s,@EXNAME@,$EXNAME,;t t -s,@VIEWNAME@,$VIEWNAME,;t t -s,@line_break@,$line_break,;t t -s,@dovimdiff@,$dovimdiff,;t t -s,@dogvimdiff@,$dogvimdiff,;t t -s,@compiledby@,$compiledby,;t t -s,@vi_cv_path_mzscheme@,$vi_cv_path_mzscheme,;t t -s,@MZSCHEME_SRC@,$MZSCHEME_SRC,;t t -s,@MZSCHEME_OBJ@,$MZSCHEME_OBJ,;t t -s,@MZSCHEME_PRO@,$MZSCHEME_PRO,;t t -s,@MZSCHEME_LIBS@,$MZSCHEME_LIBS,;t t -s,@MZSCHEME_CFLAGS@,$MZSCHEME_CFLAGS,;t t -s,@vi_cv_path_perl@,$vi_cv_path_perl,;t t -s,@vi_cv_perllib@,$vi_cv_perllib,;t t -s,@shrpenv@,$shrpenv,;t t -s,@PERL_SRC@,$PERL_SRC,;t t -s,@PERL_OBJ@,$PERL_OBJ,;t t -s,@PERL_PRO@,$PERL_PRO,;t t -s,@PERL_CFLAGS@,$PERL_CFLAGS,;t t -s,@PERL_LIBS@,$PERL_LIBS,;t t -s,@vi_cv_path_python@,$vi_cv_path_python,;t t -s,@PYTHON_CONFDIR@,$PYTHON_CONFDIR,;t t -s,@PYTHON_LIBS@,$PYTHON_LIBS,;t t -s,@PYTHON_GETPATH_CFLAGS@,$PYTHON_GETPATH_CFLAGS,;t t -s,@PYTHON_CFLAGS@,$PYTHON_CFLAGS,;t t -s,@PYTHON_SRC@,$PYTHON_SRC,;t t -s,@PYTHON_OBJ@,$PYTHON_OBJ,;t t -s,@vi_cv_path_tcl@,$vi_cv_path_tcl,;t t -s,@TCL_SRC@,$TCL_SRC,;t t -s,@TCL_OBJ@,$TCL_OBJ,;t t -s,@TCL_PRO@,$TCL_PRO,;t t -s,@TCL_CFLAGS@,$TCL_CFLAGS,;t t -s,@TCL_LIBS@,$TCL_LIBS,;t t -s,@vi_cv_path_ruby@,$vi_cv_path_ruby,;t t -s,@RUBY_SRC@,$RUBY_SRC,;t t -s,@RUBY_OBJ@,$RUBY_OBJ,;t t -s,@RUBY_PRO@,$RUBY_PRO,;t t -s,@RUBY_CFLAGS@,$RUBY_CFLAGS,;t t -s,@RUBY_LIBS@,$RUBY_LIBS,;t t -s,@WORKSHOP_SRC@,$WORKSHOP_SRC,;t t -s,@WORKSHOP_OBJ@,$WORKSHOP_OBJ,;t t -s,@NETBEANS_SRC@,$NETBEANS_SRC,;t t -s,@NETBEANS_OBJ@,$NETBEANS_OBJ,;t t -s,@SNIFF_SRC@,$SNIFF_SRC,;t t -s,@SNIFF_OBJ@,$SNIFF_OBJ,;t t -s,@xmkmfpath@,$xmkmfpath,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@X_LIB@,$X_LIB,;t t -s,@GTK_CONFIG@,$GTK_CONFIG,;t t -s,@GTK12_CONFIG@,$GTK12_CONFIG,;t t -s,@PKG_CONFIG@,$PKG_CONFIG,;t t -s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t -s,@GTK_LIBS@,$GTK_LIBS,;t t -s,@GTK_LIBNAME@,$GTK_LIBNAME,;t t -s,@GNOME_LIBS@,$GNOME_LIBS,;t t -s,@GNOME_LIBDIR@,$GNOME_LIBDIR,;t t -s,@GNOME_INCLUDEDIR@,$GNOME_INCLUDEDIR,;t t -s,@GNOME_CONFIG@,$GNOME_CONFIG,;t t -s,@MOTIF_LIBNAME@,$MOTIF_LIBNAME,;t t -s,@NARROW_PROTO@,$NARROW_PROTO,;t t -s,@GUI_INC_LOC@,$GUI_INC_LOC,;t t -s,@GUI_LIB_LOC@,$GUI_LIB_LOC,;t t -s,@GUITYPE@,$GUITYPE,;t t -s,@GUI_X_LIBS@,$GUI_X_LIBS,;t t -s,@HANGULIN_SRC@,$HANGULIN_SRC,;t t -s,@HANGULIN_OBJ@,$HANGULIN_OBJ,;t t -s,@TAGPRG@,$TAGPRG,;t t -s,@INSTALL_LANGS@,$INSTALL_LANGS,;t t -s,@INSTALL_TOOL_LANGS@,$INSTALL_TOOL_LANGS,;t t -s,@MSGFMT@,$MSGFMT,;t t -s,@MAKEMO@,$MAKEMO,;t t -s,@DEPEND_CFLAGS_FILTER@,$DEPEND_CFLAGS_FILTER,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;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 +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +CPP!$CPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +AWK!$AWK$ac_delim +STRIP!$STRIP$ac_delim +CPP_MM!$CPP_MM$ac_delim +OS_EXTRA_SRC!$OS_EXTRA_SRC$ac_delim +OS_EXTRA_OBJ!$OS_EXTRA_OBJ$ac_delim +VIMNAME!$VIMNAME$ac_delim +EXNAME!$EXNAME$ac_delim +VIEWNAME!$VIEWNAME$ac_delim +line_break!$line_break$ac_delim +dovimdiff!$dovimdiff$ac_delim +dogvimdiff!$dogvimdiff$ac_delim +compiledby!$compiledby$ac_delim +vi_cv_path_mzscheme!$vi_cv_path_mzscheme$ac_delim +MZSCHEME_SRC!$MZSCHEME_SRC$ac_delim +MZSCHEME_OBJ!$MZSCHEME_OBJ$ac_delim +MZSCHEME_PRO!$MZSCHEME_PRO$ac_delim +MZSCHEME_LIBS!$MZSCHEME_LIBS$ac_delim +MZSCHEME_CFLAGS!$MZSCHEME_CFLAGS$ac_delim +vi_cv_path_perl!$vi_cv_path_perl$ac_delim +vi_cv_perllib!$vi_cv_perllib$ac_delim +shrpenv!$shrpenv$ac_delim +PERL_SRC!$PERL_SRC$ac_delim +PERL_OBJ!$PERL_OBJ$ac_delim +PERL_PRO!$PERL_PRO$ac_delim +PERL_CFLAGS!$PERL_CFLAGS$ac_delim +PERL_LIBS!$PERL_LIBS$ac_delim +vi_cv_path_ecl_config!$vi_cv_path_ecl_config$ac_delim +ECL_LIBS!$ECL_LIBS$ac_delim +ECL_CFLAGS!$ECL_CFLAGS$ac_delim +ECL_SRC!$ECL_SRC$ac_delim +ECL_OBJ!$ECL_OBJ$ac_delim +vi_cv_path_python!$vi_cv_path_python$ac_delim +PYTHON_CONFDIR!$PYTHON_CONFDIR$ac_delim +PYTHON_LIBS!$PYTHON_LIBS$ac_delim +PYTHON_GETPATH_CFLAGS!$PYTHON_GETPATH_CFLAGS$ac_delim +PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim +PYTHON_SRC!$PYTHON_SRC$ac_delim +PYTHON_OBJ!$PYTHON_OBJ$ac_delim +vi_cv_path_tcl!$vi_cv_path_tcl$ac_delim +TCL_SRC!$TCL_SRC$ac_delim +TCL_OBJ!$TCL_OBJ$ac_delim +TCL_PRO!$TCL_PRO$ac_delim +TCL_CFLAGS!$TCL_CFLAGS$ac_delim +TCL_LIBS!$TCL_LIBS$ac_delim +vi_cv_path_ruby!$vi_cv_path_ruby$ac_delim +RUBY_SRC!$RUBY_SRC$ac_delim +RUBY_OBJ!$RUBY_OBJ$ac_delim +RUBY_PRO!$RUBY_PRO$ac_delim +RUBY_CFLAGS!$RUBY_CFLAGS$ac_delim +_ACEOF + + if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done + +ac_eof= +if grep '^CEOF$' conf$$subs.sed >/dev/null; then + ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q` + ac_eof=`expr 0$ac_eof + 1` +fi +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b _ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +RUBY_LIBS!$RUBY_LIBS$ac_delim +WORKSHOP_SRC!$WORKSHOP_SRC$ac_delim +WORKSHOP_OBJ!$WORKSHOP_OBJ$ac_delim +NETBEANS_SRC!$NETBEANS_SRC$ac_delim +NETBEANS_OBJ!$NETBEANS_OBJ$ac_delim +SNIFF_SRC!$SNIFF_SRC$ac_delim +SNIFF_OBJ!$SNIFF_OBJ$ac_delim +xmkmfpath!$xmkmfpath$ac_delim +XMKMF!$XMKMF$ac_delim +X_CFLAGS!$X_CFLAGS$ac_delim +X_PRE_LIBS!$X_PRE_LIBS$ac_delim +X_LIBS!$X_LIBS$ac_delim +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +X_LIB!$X_LIB$ac_delim +GTK_CONFIG!$GTK_CONFIG$ac_delim +GTK12_CONFIG!$GTK12_CONFIG$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +GTK_CFLAGS!$GTK_CFLAGS$ac_delim +GTK_LIBS!$GTK_LIBS$ac_delim +GTK_LIBNAME!$GTK_LIBNAME$ac_delim +GNOME_LIBS!$GNOME_LIBS$ac_delim +GNOME_LIBDIR!$GNOME_LIBDIR$ac_delim +GNOME_INCLUDEDIR!$GNOME_INCLUDEDIR$ac_delim +GNOME_CONFIG!$GNOME_CONFIG$ac_delim +MOTIF_LIBNAME!$MOTIF_LIBNAME$ac_delim +NARROW_PROTO!$NARROW_PROTO$ac_delim +GUI_INC_LOC!$GUI_INC_LOC$ac_delim +GUI_LIB_LOC!$GUI_LIB_LOC$ac_delim +GUITYPE!$GUITYPE$ac_delim +GUI_X_LIBS!$GUI_X_LIBS$ac_delim +HANGULIN_SRC!$HANGULIN_SRC$ac_delim +HANGULIN_OBJ!$HANGULIN_OBJ$ac_delim +TAGPRG!$TAGPRG$ac_delim +INSTALL_LANGS!$INSTALL_LANGS$ac_delim +INSTALL_TOOL_LANGS!$INSTALL_TOOL_LANGS$ac_delim +MSGFMT!$MSGFMT$ac_delim +MAKEMO!$MAKEMO$ac_delim +DEPEND_CFLAGS_FILTER!$DEPEND_CFLAGS_FILTER$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `grep -c "$ac_delim\$" conf$$subs.sed` = 40; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof= +if grep '^CEOF$' conf$$subs.sed >/dev/null; then + ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q` + ac_eof=`expr 0$ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_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 -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 ;; +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[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 || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$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 "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + 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 || + 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" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`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 || + 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'` + 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 ! -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;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) 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 + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`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;; + 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 + # - 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." +_ACEOF - # 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; } +cat >>$CONFIG_STATUS <<\_ACEOF +# 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= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + 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 sed "$ac_vpsub $extrasub @@ -16251,251 +16952,130 @@ cat >>$CONFIG_STATUS <<\_ACEOF :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 -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;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 +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out -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". + rm -f "$tmp/stdin" 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 ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac + ;; + :H) + # + # CONFIG_HEADER + # + + # These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where + # NAME is the cpp macro being defined, VALUE is the value it is being given. + # PARAMS is the parameter list in the macro definition--in most cases, it's + # just an empty string. + # + ac_dA='s,^\([ ]*#[ ]*\)[^ ]*\([ ][ ]*' + ac_dB='\)[ (].*$,\1define\2' + ac_dC=' ' + ac_dD=' ,' + + ac_word_regexp=[_$as_cr_Letters][_$as_cr_alnum]* +_ACEOF + +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/[\\$`]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/${ac_dA}\1$ac_dB\2${ac_dC}\3$ac_dD/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/${ac_dA}\1$ac_dB${ac_dC}\2$ac_dD/p + ' >>conftest.defines - 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 +# Remove the space that was appended to ease matching. +# Then 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. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=96 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' -# 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 +while : do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + # Write a here document: + echo ' # First, check the format of the line: + cat >"$tmp/defines.sed" <>$CONFIG_STATUS + sed ${ac_max_sed_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 + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS 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 "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + 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 + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi -done -_ACEOF + rm -f "$tmp/out12" + ;; + + + esac + +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF diff -ur --unidirectional-new-file vim70/src/config.h.in vim+async+ecl-70/src/config.h.in --- vim70/src/config.h.in 2006-04-20 08:49:16.000000000 -0400 +++ vim+async+ecl-70/src/config.h.in 2006-06-08 06:27:11.000000000 -0400 @@ -286,6 +286,9 @@ /* Define if you want to include the Perl interpreter. */ #undef FEAT_PERL +/* Define if you want to include the ECL compiler. */ +#undef FEAT_ECL + /* Define if you want to include the Python interpreter. */ #undef FEAT_PYTHON diff -ur --unidirectional-new-file vim70/src/config.mk.in vim+async+ecl-70/src/config.mk.in --- vim70/src/config.mk.in 2006-03-23 16:05:16.000000000 -0500 +++ vim+async+ecl-70/src/config.mk.in 2006-06-08 06:27:11.000000000 -0400 @@ -51,6 +51,11 @@ PERL_PRO = @PERL_PRO@ PERL_CFLAGS = @PERL_CFLAGS@ +ECL_SRC = @ECL_SRC@ +ECL_OBJ = @ECL_OBJ@ +ECL_CFLAGS = @ECL_CFLAGS@ +ECL_LIBS = @ECL_LIBS@ + PYTHON_SRC = @PYTHON_SRC@ PYTHON_OBJ = @PYTHON_OBJ@ PYTHON_CFLAGS = @PYTHON_CFLAGS@ diff -ur --unidirectional-new-file vim70/src/configure.in vim+async+ecl-70/src/configure.in --- vim70/src/configure.in 2006-05-04 06:46:11.000000000 -0400 +++ vim+async+ecl-70/src/configure.in 2006-06-08 06:27:11.000000000 -0400 @@ -554,6 +554,59 @@ AC_SUBST(PERL_CFLAGS) AC_SUBST(PERL_LIBS) +AC_MSG_CHECKING(--enable-eclinterp argument) +AC_ARG_ENABLE(eclinterp, + [ --enable-eclinterp Include ECL compiler.], , + [enable_eclinterp="no"]) +AC_MSG_RESULT($enable_eclinterp) +if test "$enable_eclinterp" = "yes"; then + dnl -- find the ecl-config executable + AC_PATH_PROG(vi_cv_path_ecl_config, ecl-config) + if test "X$vi_cv_path_ecl_config" != "X"; then + + dnl -- Ask ecl-config where to find ecl's libraries + AC_CACHE_VAL(vi_cv_path_ecl_plibs, + [ + vi_cv_path_ecl_plibs=`ecl-config --libs` + ]) + + ECL_LIBS="${vi_cv_path_ecl_plibs}" + AC_CACHE_VAL(vi_cv_path_ecl_cflags, + [ + vi_cv_path_ecl_cflags=`ecl-config --cflags` + ]) + ECL_CFLAGS="${vi_cv_path_ecl_cflags}" + + ECL_SRC="if_ecl.c" + ECL_OBJ="objects/if_ecl.o" + + dnl check that compiling a simple program still works with the flags + dnl added for ECL. + AC_MSG_CHECKING([if compile and link flags for ECL are sane]) + cflags_save=$CFLAGS + libs_save=$LIBS + CFLAGS="$CFLAGS $ECL_CFLAGS" + LIBS="$LIBS $ECL_LIBS" + AC_TRY_LINK(,[ ], + AC_MSG_RESULT(yes); ecl_ok=yes, + AC_MSG_RESULT(no: ECL DISABLED); ecl_ok=no) + CFLAGS=$cflags_save + LIBS=$libs_save + if test $ecl_ok = yes; then + AC_DEFINE(FEAT_ECL) + else + ECL_SRC= + ECL_OBJ= + ECL_LIBS= + ECL_CFLAGS= + fi + fi +fi +AC_SUBST(ECL_LIBS) +AC_SUBST(ECL_CFLAGS) +AC_SUBST(ECL_SRC) +AC_SUBST(ECL_OBJ) + AC_MSG_CHECKING(--enable-pythoninterp argument) AC_ARG_ENABLE(pythoninterp, [ --enable-pythoninterp Include Python interpreter.], , diff -ur --unidirectional-new-file vim70/src/ex_cmds.h vim+async+ecl-70/src/ex_cmds.h --- vim70/src/ex_cmds.h 2006-04-07 05:44:46.000000000 -0400 +++ vim+async+ecl-70/src/ex_cmds.h 2006-06-08 06:27:11.000000000 -0400 @@ -347,6 +347,8 @@ EXTRA|NOTRLCOM|SBOXOK|CMDWIN), EX(CMD_echon, "echon", ex_echo, EXTRA|NOTRLCOM|SBOXOK|CMDWIN), +EX(CMD_ecl, "ecl", ex_ecl, + RANGE|EXTRA|ARGOPT|CMDWIN), EX(CMD_else, "else", ex_else, TRLBAR|SBOXOK|CMDWIN), EX(CMD_elseif, "elseif", ex_else, diff -ur --unidirectional-new-file vim70/src/ex_docmd.c vim+async+ecl-70/src/ex_docmd.c --- vim70/src/ex_docmd.c 2006-05-05 12:33:19.000000000 -0400 +++ vim+async+ecl-70/src/ex_docmd.c 2006-06-08 07:22:40.000000000 -0400 @@ -132,7 +132,7 @@ static linenr_T get_address __ARGS((char_u **, int skip, int to_other_file)); static void get_flags __ARGS((exarg_T *eap)); #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \ - || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME) + || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME) || !defined(FEAT_ECL) static void ex_script_ni __ARGS((exarg_T *eap)); #endif static char_u *invalid_range __ARGS((exarg_T *eap)); @@ -266,6 +266,9 @@ # define ex_rubydo ex_ni # define ex_rubyfile ex_ni #endif +#ifndef FEAT_ECL +# define ex_ecl ex_script_ni +#endif #ifndef FEAT_SNIFF # define ex_sniff ex_ni #endif @@ -2499,6 +2502,7 @@ case CMD_echoerr: case CMD_echomsg: case CMD_echon: + case CMD_ecl: case CMD_execute: case CMD_help: case CMD_hide: diff -ur --unidirectional-new-file vim70/src/feature.h vim+async+ecl-70/src/feature.h --- vim70/src/feature.h 2006-04-26 19:14:13.000000000 -0400 +++ vim+async+ecl-70/src/feature.h 2006-06-08 06:27:11.000000000 -0400 @@ -802,6 +802,14 @@ # define FEAT_CW_EDITOR #endif +/* + * +network_io Support for asynchronous network IO used by some + * extensions and scripts. + */ +#ifdef FEAT_SMALL +# define FEAT_NETWORK_IO +#endif + /* * Preferences: * ============ @@ -1152,6 +1160,7 @@ * +mzscheme MzScheme interface: "--enable-mzscheme" * +perl Perl interface: "--enable-perlinterp" * +python Python interface: "--enable-pythoninterp" + * +ecl ECL interface: "--enable-eclinterp" * +tcl TCL interface: "--enable-tclinterp" * +sniff Sniff interface: "--enable-sniff" * +sun_workshop Sun Workshop integegration diff -ur --unidirectional-new-file vim70/src/if_ecl.c vim+async+ecl-70/src/if_ecl.c --- vim70/src/if_ecl.c 1969-12-31 19:00:00.000000000 -0500 +++ vim+async+ecl-70/src/if_ecl.c 2006-06-08 07:35:05.000000000 -0400 @@ -0,0 +1,611 @@ +/* vi:ts=8:sts=4:sw=4:iskeyword+=- + * + * VIM - Vi IMproved by Bram Moolenaar + * + * Do ":help uganda" in Vim to read copying and usage conditions. + * Do ":help credits" in Vim to see a list of people who contributed. + * See README.txt for an overview of the Vim source code. + */ +/* + * ECL (Embeddable Common-Lisp) extension by Jim Bailey. + * + * Provides the "ecl" ex command for evalutating lisp forms, + * and a "VIM" package for querying/updating vim from lisp. + * + * The ecl command can take an argument, e.g. :ecl (print 42) + * or a range to evalutate forms from a buffer, e.g. :%ecl + * + * The "VIM" package is written and documented in lisp, see the + * very first few static constants defined in this file for details. + * + * TODO: Help files need to be written so everything is documented from + * vim (the documentation is available from CL at least). + * + * TODO: ECL has undocumented threading capabilities, if threads are + * used by someone who knows how, there are threading issues with + * vim (which is single threaded). This appears to be unresolved in + * other interfaces as well. + */ + +#include "vim.h" +#undef CAR +#ifdef darwin +#include "ecl/ecl.h" +#else +#include "ecl.h" +#endif +#include "network_io.h" + +static const char *g_vim_package_definition = +"(defpackage :vim \n" +" (:use cl) \n" +" (:export #:msg \n" +" #:execute \n" +" #:expr \n" +" #:add-input-listener \n" +" #:remove-input-listener \n" +" ;; a cons of (start-line . end-line) set when :ecl is called \n" +" #:range \n" +" \n" +" #:windows \n" +" #:current-window \n" +" #:window-width \n" +" #:window-height \n" +" #:window-cursor \n" +" #:window-buffer \n" +" \n" +" #:buffers \n" +" #:current-buffer \n" +" #:buffer-line-count \n" +" #:buffer-lines \n" +" #:buffer-name \n" +" #:append-line-to-buffer \n" +" #:append-to-buffer \n" +" #:get-buffer-by-name \n" +" \n" +" #:get-line \n" +" #:replace-lines \n" +" ))"; + +/* + * This core form must be kept minimal, as it is run without + * any error output, making debugging very difficult. + */ +static const char *g_vim_package_source_core = +"(progn \n" +" (defun msg (str &optional (start 0) (end (length str))) \n" +" \"writes a message line to the screen, it must not contain newlines\" \n" +" (check-type str string) \n" +" (check-type start fixnum) \n" +" (check-type end fixnum) \n" +" (msg-int str start end)) \n" +" \n" +" ;; *standard-output* and *error-output* must be redirected to use \n" +" ;; vim's msg(). This is done using ECL's gray streams. \n" +" (defclass msg-stream (si::fundamental-character-output-stream) \n" +" ((buffer :initform \"\"))) \n" +" \n" +" (defmethod si:stream-write-char ((strm msg-stream) char) \n" +" (with-slots (buffer) strm \n" +" (cond \n" +" ((char= char #\\newline) \n" +" (msg buffer) \n" +" (setf buffer \"\")) \n" +" (t \n" +" (setf buffer (concatenate 'string buffer (string char))))))) \n" +" \n" +" (cl:setq *standard-output* (make-instance 'msg-stream)) \n" +" (cl:setq *error-output* *standard-output*) \n" +" \n" +" ;; Using msg() does not work very well unless executing an ex cmd. \n" +" ;; At all other times it is best to send output to a special ecl buffer. \n" +" (defun buffer-append-char (buffer char) \n" +" (let ((tail (buffer-line-count buffer))) \n" +" (if (char= char #\\newline) \n" +" (replace-lines (list \"\") \n" +" :start (1+ tail) \n" +" :buffer buffer) \n" +" (replace-lines (list (format nil \"~a~a\" \n" +" (get-line tail buffer) char)) \n" +" :start tail \n" +" :end (1+ tail) \n" +" :buffer buffer)))) \n" +" \n" +" (defclass vim-buf-stream (si::fundamental-character-output-stream) \n" +" ((buffer :accessor buffer :initform nil))) \n" +" \n" +" (defmethod si:stream-line-column ((strm msg-stream)) \n" +" (with-slots (buffer) strm \n" +" (length buffer))) \n" +" \n" +" (defmethod si:stream-write-char ((strm vim-buf-stream) char) \n" +" (unless (and (buffer strm) \n" +" (find (buffer strm) (buffers) :test 'equal)) \n" +" (execute \"new\") \n" +" (setf (buffer strm) (current-buffer))) \n" +" (buffer-append-char (buffer strm) char)) \n" +" \n" +" (defvar *vim-buf-stream* (make-instance 'vim-buf-stream)) \n" +" \n" +" (defun safe-eval (form from-ex) \n" +" \"evaluates a form, reporting any errors\" \n" +" (handler-case \n" +" (if from-ex \n" +" (progn \n" +" (when (stringp form) \n" +" (cl:setq form (read-from-string form))) \n" +" (eval form) \n" +" (fresh-line *standard-output*)) \n" +" (let ((*standard-output* *vim-buf-stream*) \n" +" (*error-output* *vim-buf-stream*)) \n" +" (eval form))) \n" +" (error (cnd) \n" +" (format t \"ERROR: ~a~%\" cnd)))) \n" +" )"; + +/* + * Global packages and symbols. + */ +static cl_object g_vim_package; +static cl_object g_window_symbol; +static cl_object g_buffer_symbol; + +static cl_object intern_vim(const char *name) +{ + return cl_intern(2, make_string_copy(name), g_vim_package); +} + +static char *string_to_line(cl_object string) +{ + char *line = alloc(string->string.fillp + 1); + memcpy(line, string->string.self, string->string.fillp); + line[string->string.fillp] = 0; + return line; +} + +/* + * Copied from if_python.c, thanks. + */ +static void fix_cursor(int lo, int hi, int extra) +{ + if (curwin->w_cursor.lnum >= lo) + { + /* Adjust the cursor position if it's in/after the changed + * lines. */ + if (curwin->w_cursor.lnum >= hi) + { + curwin->w_cursor.lnum += extra; + check_cursor_col(); + } + else if (extra < 0) + { + curwin->w_cursor.lnum = lo; + check_cursor(); + } + changed_cline_bef_curs(); + } + invalidate_botline(); +} + +static char *zero_terminate(cl_object string) +{ + int length = string->string.fillp; + char *buf = alloc(length + 1); + memcpy(buf, string->string.self, length); + buf[length] = 0; + return buf; +} + +/* + * vim callbacks + */ + +static cl_object cl_vim_msg_int(cl_narg narg, cl_object string, cl_object start, cl_object end) +{ + int start_pos = fix(start); + int end_pos = fix(end); + int length = end_pos - start_pos; + char *buf; + + if (length < 0) + return Cnil; + + buf = alloc(length + 1); + memcpy(buf, string->string.self + start_pos, length); + buf[length] = 0; + msg(buf); + vim_free(buf); + + return Ct; +} + +static cl_object cl_vim_execute_int(cl_object cmd) +{ + char *buf = zero_terminate( cmd ); + do_cmdline_cmd(buf); + vim_free(buf); + + return Ct; +} + +static cl_object cl_vim_expr_int(cl_object cmd) +{ + char *buf = zero_terminate(cmd); + char *vim_result = (char *) eval_to_string(buf, NULL, FALSE); + vim_free(buf); + if (NULL == vim_result) return Cnil; + + cl_object cl_result = make_string_copy( vim_result ); + vim_free( vim_result ); + return cl_result; +} + + +/* + * Async socket reading. + */ +static cl_object safe_eval_form(cl_object form, int from_ex); + +static void listener_callback(int fd, void *data) +{ + safe_eval_form((cl_object)data, FALSE); + update_screen(NOT_VALID); + setcursor(); + out_flush(); +#ifdef FEAT_GUI + if (gui.in_use) + { + gui_update_cursor(TRUE, FALSE); + gui_mch_flush(); + } +#endif +} + +static cl_object cl_vim_add_input_listener_int(cl_object stream, cl_object form) +{ + nwio_register_input_handler(fileno(stream->stream.file), + listener_callback, + (void *)form); + return Ct; +} + +static cl_object cl_vim_remove_input_listener_int(cl_object stream) +{ + nwio_unregister_input_handler(fileno(stream->stream.file)); + return Ct; +} + +/* + * windows + */ + +static cl_object cl_vim_windows_int() +{ + cl_object result = Cnil; + win_T *vwin = firstwin; + + while (vwin) + { + result = make_cons(ecl_make_foreign_data(g_window_symbol, + sizeof(win_T *), + vwin), + result); + vwin = W_NEXT(vwin); + } + + return cl_nreverse(result); +} + +static cl_object cl_vim_current_window_int() +{ + return ecl_make_foreign_data(g_window_symbol, + sizeof(win_T *), + curwin); +} + +static cl_object cl_vim_window_width_int(cl_object win_) +{ + win_T *win = ((win_T *)ecl_foreign_data_pointer_safe(win_)); + + return MAKE_FIXNUM(win->w_width); +} + +static cl_object cl_vim_window_height_int(cl_object win_) +{ + win_T *win = ((win_T *)ecl_foreign_data_pointer_safe(win_)); + + return MAKE_FIXNUM(win->w_height); +} + +static cl_object cl_vim_window_cursor_int(cl_object win_) +{ + win_T *win = ((win_T *)ecl_foreign_data_pointer_safe(win_)); + + return make_cons(MAKE_FIXNUM(win->w_cursor.lnum - 1), + MAKE_FIXNUM(win->w_cursor.col)); +} + +static cl_object cl_vim_window_buffer_int(cl_object win_) +{ + win_T *win = ((win_T *)ecl_foreign_data_pointer_safe(win_)); + + return ecl_make_foreign_data(g_buffer_symbol, + sizeof(buf_T *), + win->w_buffer); +} + +/* + * buffers + */ + +static cl_object cl_vim_buffers_int() +{ + cl_object result = Cnil; + buf_T *vbuf = firstbuf; + + while (vbuf) + { + result = make_cons(ecl_make_foreign_data(g_buffer_symbol, + sizeof(buf_T *), + vbuf), + result); + vbuf = vbuf->b_next; + } + + return cl_nreverse(result); +} + +static cl_object cl_vim_current_buffer_int() +{ + return ecl_make_foreign_data(g_buffer_symbol, + sizeof(buf_T *), + curbuf); +} + +static cl_object cl_vim_buffer_line_count_int(cl_object buf_) +{ + buf_T *buf = ((buf_T *)ecl_foreign_data_pointer_safe(buf_)); + + return MAKE_FIXNUM(buf->b_ml.ml_line_count); +} + +/* + start_ and end_ and fixnums in the range 0..(num_lines-1) +*/ + +static cl_object cl_vim_buffer_lines_int(cl_object buf_, cl_object start_, cl_object end_) +{ + buf_T *buf = ((buf_T *)ecl_foreign_data_pointer_safe(buf_)); + int start = fix(start_) + 1; + int end = fix(end_); + cl_object result = Cnil; + + while (end >= start) + { + result = make_cons(make_string_copy(ml_get_buf(buf, end--, FALSE)), + result); + } + + return result; +} + +static cl_object cl_vim_buffer_name_int (cl_object buf_) +{ + buf_T *buf = ((buf_T *)ecl_foreign_data_pointer_safe(buf_)); + return make_string_copy (buf->b_fname); +} +/* + start1_ and end1_ and fixnums in the range 0..(num_lines-1) +*/ + +static cl_object cl_vim_replace_lines_int(cl_object buf, cl_object lines, cl_object start1_, cl_object end1_, cl_object start2_, cl_object end2_) +{ + linenr_T start1 = (linenr_T)fix(start1_) + 1; + linenr_T end1 = (linenr_T)fix(end1_) + 1; + int start2 = fix(start2_); + int new_len = fix(end2_); + int old_len = end1 - start1; + int max_len; + int i; + buf_T *savebuf = curbuf; + + curbuf = ((buf_T *)ecl_foreign_data_pointer_safe(buf)); + + if (start2 > 0) + { + /* take off the head of the list */ + lines = cl_nthcdr(start2_, lines); + new_len -= start2; + } + + max_len = new_len > old_len ? new_len : old_len; + + /* save undo information + * Need to restrict the length to the buffer size or + * the u_save fails + */ + if (start1 + max_len > curbuf->b_ml.ml_line_count + 1) + u_save(start1 - 1, curbuf->b_ml.ml_line_count + 1); + else + u_save(start1 - 1, start1 + max_len); + + /* delete excess lines */ + for (i = 0; i < old_len - new_len; ++i) + { + ml_delete(start1, FALSE); + } + + /* replace existing lines */ + for (i = 0; i < old_len && i < new_len; ++i) + { + ml_replace(start1 + i, string_to_line(cl_car(lines)), FALSE); + lines = cl_cdr(lines); + } + + /* add new lines (must be freed) */ + while (i < new_len) + { + char_u *line = string_to_line(cl_car(lines)); + ml_append(start1 + i - 1, line, 0, FALSE); + vim_free(line); + lines = cl_cdr(lines); + ++i; + } + + /* adjust marks */ + mark_adjust(start1, end1 - 1, + (long)MAXLNUM, (long)(new_len - old_len)); + changed_lines(start1, 0, end1, (long)(new_len - old_len)); + + /* fix cursor */ + if (curbuf == savebuf) + fix_cursor(start1, end1, (new_len - old_len)); + + /* restore and return */ + curbuf = savebuf; + return Ct; +} + +/* + * helpers + */ + +static cl_object eval_string(const char *form) +{ + return cl_eval(c_string_to_object(form)); +} + +cl_object safe_eval_form(cl_object form, int from_ex) +{ + /* uses vim::safe-eval to trap errors */ + static cl_object safe_eval = 0; + + if (safe_eval == 0) + { + /* get the safe eval and quote symbols */ + safe_eval = intern_vim("SAFE-EVAL"); + } + + /* this is (vim::safe-eval form from_ex) */ + return si_eval_with_env(1, cl_list(3, + safe_eval, + form, + from_ex == TRUE ? Ct : Cnil)); +} + +static cl_object safe_eval_string(const char *string, int from_ex) +{ + return safe_eval_form(make_string_copy(string), from_ex); +} + +static void +RunEclCommand(exarg_T *eap, const char *cmd) +{ + static int have_inited = 0; + static cl_object range; + + if (!have_inited) + { + static char *argv[] = {"ecl", 0}; + have_inited = 1; + cl_boot(1, argv); + + /* create the vim package */ + g_vim_package = eval_string(g_vim_package_definition); + + /* add the lisp->c functions */ + cl_def_c_function_va(intern_vim("MSG-INT"), cl_vim_msg_int); + cl_def_c_function(intern_vim("EXECUTE-INT"), cl_vim_execute_int, 1); + cl_def_c_function(intern_vim("EXPR-INT"), cl_vim_expr_int, 1); + cl_def_c_function(intern_vim("ADD-INPUT-LISTENER-INT"), + cl_vim_add_input_listener_int, 2); + cl_def_c_function(intern_vim("REMOVE-INPUT-LISTENER-INT"), + cl_vim_remove_input_listener_int, 1); + + g_window_symbol = intern_vim("WINDOW"); + + cl_def_c_function(intern_vim("WINDOWS-INT"), + cl_vim_windows_int, 0); + cl_def_c_function(intern_vim("CURRENT-WINDOW-INT"), + cl_vim_current_window_int, 0); + cl_def_c_function(intern_vim("WINDOW-WIDTH-INT"), + cl_vim_window_width_int, 1); + cl_def_c_function(intern_vim("WINDOW-HEIGHT-INT"), + cl_vim_window_height_int, 1); + cl_def_c_function(intern_vim("WINDOW-CURSOR-INT"), + cl_vim_window_cursor_int, 1); + cl_def_c_function(intern_vim("WINDOW-BUFFER-INT"), + cl_vim_window_buffer_int, 1); + + + g_buffer_symbol = intern_vim("BUFFER"); + + cl_def_c_function(intern_vim("BUFFERS-INT"), + cl_vim_buffers_int, 0); + cl_def_c_function(intern_vim("CURRENT-BUFFER-INT"), + cl_vim_current_buffer_int, 0); + cl_def_c_function(intern_vim("BUFFER-LINE-COUNT-INT"), + cl_vim_buffer_line_count_int, 1); + cl_def_c_function(intern_vim("BUFFER-LINES-INT"), + cl_vim_buffer_lines_int, 3); + cl_def_c_function(intern_vim("BUFFER-NAME-INT"), + cl_vim_buffer_name_int, 1); + + + cl_def_c_function(intern_vim("REPLACE-LINES-INT"), + cl_vim_replace_lines_int, 6); + + /* Eval the vim package source, + * the minimal core sets up the "safe" version. */ + eval_string("(in-package :vim)"); + eval_string(g_vim_package_source_core); + + /* return to cl-user */ + eval_string("(in-package :cl-user)"); + + /* + * Load the lisp source that is provided with the runtime, + * this is responsible for defining the public :vim interface. + */ + safe_eval_string("(cl:load (cl:format nil \"~a/if_ecl.lisp\" (vim::expr-int \"$VIMRUNTIME\")))", TRUE); + + /* get needed symbols */ + range = intern_vim("RANGE"); + } + + /* Store the range. */ + cl_set(range, cl_cons(MAKE_FIXNUM(eap->line1), + MAKE_FIXNUM(eap->line2))); + + /* Run the string, this isn't a REPL loop so the result is discarded. */ + if (cmd[0] == '\0') + safe_eval_string("(vim:eval-range)", TRUE); + else + safe_eval_string(cmd, TRUE); +} + +/* + * ":ecl" command + */ +void +ex_ecl(exarg_T *eap) +{ + char_u *script; + + script = script_get(eap, eap->arg); + if (!eap->skip) + { + if (script == NULL) + RunEclCommand(eap, (char *)eap->arg); + else + RunEclCommand(eap, (char *)script); + } + + vim_free(script); +} + + void +ecl_end() +{ +} + diff -ur --unidirectional-new-file vim70/src/main.c vim+async+ecl-70/src/main.c --- vim70/src/main.c 2006-05-03 13:36:44.000000000 -0400 +++ vim+async+ecl-70/src/main.c 2006-06-08 07:22:40.000000000 -0400 @@ -1269,6 +1269,9 @@ windgoto((int)Rows - 1, 0); #endif +#ifdef FEAT_ECL + ecl_end(); +#endif #ifdef FEAT_MZSCHEME mzscheme_end(); #endif diff -ur --unidirectional-new-file vim70/src/network_io.c vim+async+ecl-70/src/network_io.c --- vim70/src/network_io.c 1969-12-31 19:00:00.000000000 -0500 +++ vim+async+ecl-70/src/network_io.c 2006-06-08 06:27:11.000000000 -0400 @@ -0,0 +1,195 @@ +/* vi:set ts=8 sts=4 sw=4: + * + * VIM - Vi IMproved by Bram Moolenaar + * OS/2 port by Paul Slootman + * VMS merge by Zoltan Arpadffy + * + * Do ":help uganda" in Vim to read copying and usage conditions. + * Do ":help credits" in Vim to see a list of people who contributed. + * See README.txt for an overview of the Vim source code. + */ +/* + * Network and asynchronous io code amalgamation by Jim Bailey. + * Most of this code was copied from other parts of this project. + */ + +#include "vim.h" + +#include "network_io.h" + +/* + * Includes and definitions taken from netbeans.c + */ +#ifdef WIN32 +# include +/* WinSock API is separated from C API, thus we can't use read(), write(), + * errno... */ +# define sock_errno WSAGetLastError() +# define ECONNREFUSED WSAECONNREFUSED +# ifdef EINTR +# undef EINTR +# endif +# define EINTR WSAEINTR +# define sock_write(sd, buf, len) send(sd, buf, len, 0) +# define sock_read(sd, buf, len) recv(sd, buf, len, 0) +# define sock_close(sd) closesocket(sd) +#else +# include +# include +# include +# ifdef HAVE_LIBGEN_H +# include +# endif +# define sock_errno errno +# define sock_write(sd, buf, len) write(sd, buf, len) +# define sock_read(sd, buf, len) read(sd, buf, len) +# define sock_close(sd) close(sd) +#endif + +#define INET_SOCKETS + +typedef struct +{ + int fd; + nwio_input_handler_T handler; + void *handler_data; + + /* + * Some platforms require a handle to be used to unregister, + * others use the fd. + */ +#ifdef FEAT_GUI_MOTIF + XtInputId motif_handle; +#endif +#ifdef FEAT_GUI_GTK + gint gtk_handle; +#endif + +} registered_socket_T; + +/* + * A lot of OSs have a maximum FD limit at around 1024 (at least by default). + * Hopefully half that amount should be enough for an editor, if not this + * should be replaced with dynamic allocation. + */ +#define MAX_REGISTERED 512 + +/* + * The sockets array is kept holeless, when an entry from the middle + * is unregistered, the end entry is moved to take its place. + */ +static registered_socket_T g_sockets[MAX_REGISTERED]; +static unsigned int g_registered = 0; + + +#if defined(FEAT_GUI_GTK) +void gtk_input_handler(gpointer data, + gint source, + GdkInputCondition condition) +{ + nwio_fd_ready(source); +} +#endif + + +int nwio_register_input_handler(int fd, nwio_input_handler_T handler, void *data) +{ + registered_socket_T *socket; + + if (fd < 0 || g_registered == MAX_REGISTERED) + return FALSE; + + socket = &g_sockets[g_registered++]; + socket->fd = fd; + socket->handler = handler; + socket->handler_data = data; + +#if defined(FEAT_GUI_GTK) + if (gui.in_use) + { + socket->gtk_handle = gdk_input_add(fd, + (GdkInputCondition)((int)GDK_INPUT_READ + (int)GDK_INPUT_EXCEPTION), + gtk_input_handler, NULL); + } +#endif + + return TRUE; +} + +void nwio_unregister_input_handler(int fd) +{ + registered_socket_T *socket; + int idx; + + for (idx = 0; ; ++idx) + { + /* return if it is not found */ + if (idx == g_registered) + return; + + if (g_sockets[idx].fd == fd) + break; + } + + socket = &g_sockets[idx]; + +#if defined(FEAT_GUI_GTK) + if (gui.in_use) + { + gdk_input_remove(socket->gtk_handle); + } +#endif + + // replace any middle entries with the end. + if (--g_registered != idx) + { + *socket = g_sockets[g_registered]; + } +} + + +/* + * Functions used by os_unix.c for selecting/polling while + * on a terminal. + */ + +/* + * Returns the number of sockets that have been registered for waiting. + */ +int nwio_get_fd_count() +{ + return g_registered; +} + +/* + * Returns the file descriptor at the given index, 0 <= idx < nwio_get_fd_count() + */ +int nwio_get_fd(int idx) +{ + return g_sockets[idx].fd; +} + +/* + * Called after the select/poll on each fd that has receive events. + */ +void nwio_fd_ready(int fd) +{ + registered_socket_T *socket; + int idx; + + for (idx = 0; idx < g_registered; ++idx) + { + socket = &g_sockets[idx]; + if (socket->fd == fd) + { + (*socket->handler)(fd, socket->handler_data); + } + } +} + + +/* + * Network client interface + */ + +/* TODO */ diff -ur --unidirectional-new-file vim70/src/network_io.h vim+async+ecl-70/src/network_io.h --- vim70/src/network_io.h 1969-12-31 19:00:00.000000000 -0500 +++ vim+async+ecl-70/src/network_io.h 2006-06-08 06:27:11.000000000 -0400 @@ -0,0 +1,73 @@ +/* vi:set ts=8 sts=4 sw=4: + * + * VIM - Vi IMproved by Bram Moolenaar + * + * Do ":help uganda" in Vim to read copying and usage conditions. + * Do ":help credits" in Vim to see a list of people who contributed. + */ + +/* + * The callback prototype for InputHandlers + */ +typedef void (*nwio_input_handler_T)(int fd, void *data); + +/* + * Registers a socket file descriptor with a function to be called + * when data is ready for reading. + * Returns TRUE on success. + */ +int nwio_register_input_handler(int fd, nwio_input_handler_T handler, void *data); + +/* + * Unregisters a socket file descriptor. + */ +void nwio_unregister_input_handler(int fd); + + +/* + * Network client interface + */ + +/* + * Connects to the given host and port, returning either the socket fd + * or -1 on failure. + */ +int nwio_connect(const char *host, int port); + +/* + * Sends data over a connection. + */ +int nwio_write(int fd, void *buffer, int length); + +/* + * Receives data from a connection. This will block until at least some data + * is read, so is best called within a nwio_input_handler. + */ +int nwio_read(int fd, void *buffer, int length); + +/* + * Closes a connection + */ +int nwio_close(int fd); + + +/* + * Functions used by os_unix.c for selecting/polling while + * on a terminal. + */ + +/* + * Returns the number of sockets that have been registered for waiting. + */ +int nwio_get_fd_count(); + +/* + * Returns the file descriptor at the given index, 0 <= idx < nwio_get_fd_count() + */ +int nwio_get_fd(int idx); + +/* + * Called after the select/poll on each fd that has receive events. + */ +void nwio_fd_ready(int fd); + diff -ur --unidirectional-new-file vim70/src/os_unix.c vim+async+ecl-70/src/os_unix.c --- vim70/src/os_unix.c 2006-05-01 04:13:15.000000000 -0400 +++ vim+async+ecl-70/src/os_unix.c 2006-06-08 06:54:14.000000000 -0400 @@ -40,6 +40,7 @@ #endif #include "os_unixx.h" /* unix includes for os_unix.c only */ +#include "network_io.h" #ifdef USE_XSMP # include @@ -4539,7 +4540,14 @@ # endif #endif #ifndef HAVE_SELECT - struct pollfd fds[5]; +# ifdef FEAT_NETWORK_IO + struct pollfd *fds; + int i; + int nwio_idx; + int nwio_count; +# else + struct pollfd fds[5]; +# endif int nfd; # ifdef FEAT_XCLIPBOARD int xterm_idx = -1; @@ -4560,6 +4568,12 @@ mzquantum_used = TRUE; } # endif + +# ifdef FEAT_NETWORK_IO + fds = (struct pollfd *)alloc((5 + nwio_get_fd_count()) + * sizeof(struct pollfd)); +# endif + fds[0].fd = fd; fds[0].events = POLLIN; nfd = 1; @@ -4601,7 +4615,30 @@ } # endif + +# ifdef FEAT_NETWORK_IO + nwio_count = nwio_get_fd_count(); + nwio_idx = nfd; + for (i = 0; i < nwio_count; ++i) + { + fds[nfd].fd = nwio_get_fd(i); + fds[nfd].events = POLLIN; + ++nfd; + } +# endif + ret = poll(fds, nfd, towait); + +# ifdef FEAT_NETWORK_IO + for (i = 0; i < nwio_count; ++i) + { + if (fds[nwio_idx + i].revents & (POLLIN | POLLHUP)) + { + nwio_fd_ready(fds[nwio_idx + i].fd); + } + } +# endif + # ifdef FEAT_MZSCHEME if (ret == 0 && mzquantum_used) /* MzThreads scheduling is required and timeout occured */ @@ -4654,7 +4691,10 @@ } # endif - +# ifdef FEAT_NETWORK_IO + vim_free(fds); +# endif + #else /* HAVE_SELECT */ struct timeval tv; @@ -4662,6 +4702,10 @@ fd_set rfds, efds; int maxfd; long towait = msec; +# ifdef FEAT_NETWORK_IO + int i; + int nwio_count; +# endif # ifdef FEAT_MZSCHEME mzvim_check_threads(); @@ -4735,6 +4779,18 @@ } # endif +# ifdef FEAT_NETWORK_IO + nwio_count = nwio_get_fd_count(); + for (i = 0; i < nwio_count; ++i) + { + int fd = nwio_get_fd(i); + FD_SET(fd, &rfds); + FD_SET(fd, &efds); + if (maxfd < fd) + maxfd = fd; + } +# endif + # ifdef OLD_VMS /* Old VMS as v6.2 and older have broken select(). It waits more than * required. Should not be used */ @@ -4748,6 +4804,19 @@ finished = FALSE; # endif +# ifdef FEAT_NETWORK_IO + /* + * There is no really good way to know which fds were used + * as listeners can be unregistered during calls to nwio_fd_ready. + * This will make sure all fds are handled even if it is not optimal. + */ + for (i = 0; i <= maxfd; ++i) + { + if (FD_ISSET(i, &rfds) || FD_ISSET(i, &efds)) + nwio_fd_ready(i); + } +# endif + # ifdef FEAT_SNIFF if (ret < 0 ) sniff_disconnect(1); diff -ur --unidirectional-new-file vim70/src/proto/if_ecl.pro vim+async+ecl-70/src/proto/if_ecl.pro --- vim70/src/proto/if_ecl.pro 1969-12-31 19:00:00.000000000 -0500 +++ vim+async+ecl-70/src/proto/if_ecl.pro 2006-06-08 07:36:40.000000000 -0400 @@ -0,0 +1,4 @@ +/* if_ecl.c */ +extern void ex_ecl __ARGS((exarg_T *eap)); +extern void ecl_end __ARGS((void)); +/* vim: set ft=c : */ diff -ur --unidirectional-new-file vim70/src/proto.h vim+async+ecl-70/src/proto.h --- vim70/src/proto.h 2006-03-24 12:15:37.000000000 -0500 +++ vim+async+ecl-70/src/proto.h 2006-06-08 06:55:24.000000000 -0400 @@ -167,6 +167,10 @@ # include "if_python.pro" # endif +# ifdef FEAT_ECL +# include "if_ecl.pro" +# endif + # ifdef FEAT_TCL # include "if_tcl.pro" # endif diff -ur --unidirectional-new-file vim70/src/version.c vim+async+ecl-70/src/version.c --- vim70/src/version.c 2006-05-03 03:50:42.000000000 -0400 +++ vim+async+ecl-70/src/version.c 2006-06-08 06:29:08.000000000 -0400 @@ -182,6 +182,11 @@ #else "-ebcdic", #endif +#ifdef FEAT_ECL + "+ecl", +#else + "-ecl", +#endif #ifdef FEAT_EMACS_TAGS "+emacs_tags", #else diff -ur --unidirectional-new-file vim70/src/vim.h vim+async+ecl-70/src/vim.h --- vim70/src/vim.h 2006-04-30 11:32:38.000000000 -0400 +++ vim+async+ecl-70/src/vim.h 2006-06-08 07:23:52.000000000 -0400 @@ -16,6 +16,7 @@ defined(FEAT_RUBY) || \ defined(FEAT_TCL) || \ defined(FEAT_MZSCHEME) || \ + defined(FEAT_ECL) || \ defined(DYNAMIC_GETTEXT) || \ defined(DYNAMIC_ICONV) || \ defined(DYNAMIC_IME) || \