summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--runtime/doc/eval.txt49
-rw-r--r--runtime/doc/intro.txt4
-rw-r--r--runtime/doc/options.txt4
-rw-r--r--runtime/doc/syntax.txt5
-rw-r--r--runtime/doc/tags4
-rw-r--r--runtime/doc/todo.txt20
-rw-r--r--runtime/doc/usr_21.txt4
-rw-r--r--runtime/doc/version7.txt21
-rw-r--r--runtime/syntax/2html.vim92
-rw-r--r--runtime/syntax/slrnsc.vim6
-rwxr-xr-xsrc/auto/configure577
-rw-r--r--src/configure.in7
-rw-r--r--src/eval.c84
-rw-r--r--src/ex_cmds.c15
-rw-r--r--src/ex_cmds.h4
-rw-r--r--src/ex_cmds2.c6
-rw-r--r--src/feature.h5
-rw-r--r--src/fold.c87
-rw-r--r--src/gui_gtk.c76
-rw-r--r--src/misc2.c10
-rw-r--r--src/option.c4
-rw-r--r--src/proto/gui_gtk.pro1
-rw-r--r--src/proto/message.pro3
-rw-r--r--src/regexp.c5
-rw-r--r--src/screen.c69
25 files changed, 718 insertions, 444 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index f3ee1feaf4..cd3e3046aa 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0aa. Last change: 2004 Oct 06
+*eval.txt* For Vim version 7.0aa. Last change: 2004 Oct 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -670,19 +670,19 @@ v:fname_diff The name of the diff (patch) file. Only valid while
*v:folddashes* *folddashes-variable*
v:folddashes Used for 'foldtext': dashes representing foldlevel of a closed
fold.
- Read-only. |fold-foldtext|
+ Read-only in the |sandbox|. |fold-foldtext|
*v:foldlevel* *foldlevel-variable*
v:foldlevel Used for 'foldtext': foldlevel of closed fold.
- Read-only. |fold-foldtext|
+ Read-only in the |sandbox|. |fold-foldtext|
*v:foldend* *foldend-variable*
v:foldend Used for 'foldtext': last line of closed fold.
- Read-only. |fold-foldtext|
+ Read-only in the |sandbox|. |fold-foldtext|
*v:foldstart* *foldstart-variable*
v:foldstart Used for 'foldtext': first line of closed fold.
- Read-only. |fold-foldtext|
+ Read-only in the |sandbox|. |fold-foldtext|
*v:insertmode* *insertmode-variable*
v:insertmode Used for the |InsertEnter| and |InsertChange| autocommand
@@ -710,9 +710,9 @@ v:lc_time The current locale setting for time messages of the runtime
command. See |multi-lang|.
*v:lnum* *lnum-variable*
-v:lnum Line number for the 'foldexpr' and 'indentexpr' expressions.
- Only valid while one of these expressions is being evaluated.
- Read-only. |fold-expr| 'indentexpr'
+v:lnum Line number for the 'foldexpr' |fold-expr| and 'indentexpr'
+ expressions. Only valid while one of these expressions is
+ being evaluated. Read-only when in the |sandbox|.
*v:prevcount* *prevcount-variable*
v:prevcount The count given for the last but one Normal mode command.
@@ -812,6 +812,7 @@ argidx() Number current index in the argument list
argv( {nr}) String {nr} entry of the argument list
browse( {save}, {title}, {initdir}, {default})
String put up a file requester
+browsedir( {title}, {initdir}) String put up a directory requester
bufexists( {expr}) Number TRUE if buffer {expr} exists
buflisted( {expr}) Number TRUE if buffer {expr} is listed
bufloaded( {expr}) Number TRUE if buffer {expr} is loaded
@@ -989,6 +990,19 @@ browse({save}, {title}, {initdir}, {default})
When the "Cancel" button is hit, something went wrong, or
browsing is not possible, an empty string is returned.
+ *browsedir()*
+browsedir({title}, {initdir})
+ Put up a directory requester. This only works when
+ "has("browse")" returns non-zero (only in some GUI versions).
+ On systems where a directory browser is not supported a file
+ browser is used. In that case: select a file in the directory
+ to be used.
+ The input fields are:
+ {title} title for the requester
+ {initdir} directory to start browsing in
+ When the "Cancel" button is hit, something went wrong, or
+ browsing is not possible, an empty string is returned.
+
bufexists({expr}) *bufexists()*
The result is a Number, which is non-zero if a buffer called
{expr} exists.
@@ -1489,6 +1503,16 @@ foldtext() Returns a String, to be displayed for a closed fold. This is
options is removed.
{not available when compiled without the |+folding| feature}
+foldtextresult({lnum}) *foldtextresult()*
+ Returns the text that is displayed for the closed fold at line
+ {lnum}. Evaluates 'foldtext' in the appropriate context.
+ When there is no closed fold at {lnum} an empty string is
+ returned.
+ {lnum} is used like with |getline()|. Thus "." is the current
+ line, "'m" mark m, etc.
+ Useful when exporting folded text, e.g., to HTML.
+ {not available when compiled without the |+folding| feature}
+
*foreground()*
foreground() Move the Vim window to the foreground. Useful when sent from
a client to a Vim server. |remote_send()|
@@ -4716,7 +4740,7 @@ options are evaluated in a sandbox. This means that you are protected from
these expressions having nasty side effects. This gives some safety for when
these options are set from a modeline. It is also used when the command from
a tags file is executed.
-This is not guaranteed 100% secure, but it should block most attacks.
+The sandbox is also used for the |:sandbox| command.
These items are not allowed in the sandbox:
- changing the buffer text
@@ -4725,5 +4749,12 @@ These items are not allowed in the sandbox:
- executing a shell command
- reading or writing a file
- jumping to another buffer or editing a file
+This is not guaranteed 100% secure, but it should block most attacks.
+
+ *:san* *:sandbox*
+:sandbox {cmd} Execute {cmd} in the sandbox. Useful to evaluate an
+ option that may have been set from a modeline, e.g.
+ 'foldexpr'.
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 8d3ac6eadf..03f7315baa 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt* For Vim version 7.0aa. Last change: 2004 Jun 12
+*intro.txt* For Vim version 7.0aa. Last change: 2004 Oct 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -226,12 +226,14 @@ Vim would never have become what it is now, without the help of these people!
Kayhan Demirel sent me news in Uganda
Chris & John Downey xvi (ideas for multi-windows version)
Henk Elbers first VMS port
+ Daniel Elstner GTK+ 2 port
Eric Fischer Mac port, 'cindent', and other improvements
Benji Fisher Answering lots of user questions
Bill Foster Athena GUI port
Loic Grenie xvim (ideas for multi windows version)
Sven Guckes Vim promotor and previous WWW page maintainer
Darren Hiebert Exuberant ctags
+ Jason Hildebrand GTK+ 2 port
Bruce Hunsaker improvements for VMS port
Andy Kahn Cscope support, GTK+ GUI port
Oezguer Kesim Maintainer of Vim Mailing Lists
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4879a64b69..6001909d01 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0aa. Last change: 2004 Oct 07
+*options.txt* For Vim version 7.0aa. Last change: 2004 Oct 08
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1062,7 +1062,7 @@ A jump table for the options with a short description can be found at |Q_op|.
break if 'linebreak' is on.
*'browsedir'* *'bsdir'*
-'browsedir' 'bsdir' string (default for "last")
+'browsedir' 'bsdir' string (default: "last")
global
{not in Vi} {only for Motif and Win32 GUI}
Which directory to use for the file browser:
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 6fe03f9dd1..a7d6d2b3b9 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.0aa. Last change: 2004 Sep 18
+*syntax.txt* For Vim version 7.0aa. Last change: 2004 Oct 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -393,6 +393,9 @@ Force to omit the line numbers by using a zero value: >
Go back to the default to use 'number' by deleting the variable: >
:unlet html_number_lines
+Closed folds are put in the HTML as they are displayed. If you don't want
+this, use the "zR" command before invoking 2html.
+
By default, HTML optimized for old browsers is generated. If you prefer using
cascading style sheets (CSS1) for the attributes (resulting in considerably
shorter and valid HTML 4 file), use: >
diff --git a/runtime/doc/tags b/runtime/doc/tags
index c46eeb65bc..d54f794bf7 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -2266,6 +2266,8 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
:sa windows.txt /*:sa*
:sal windows.txt /*:sal*
:sall windows.txt /*:sall*
+:san eval.txt /*:san*
+:sandbox eval.txt /*:sandbox*
:sargument windows.txt /*:sargument*
:sav editing.txt /*:sav*
:saveas editing.txt /*:saveas*
@@ -4052,6 +4054,7 @@ book intro.txt /*book*
boolean options.txt /*boolean*
break-finally eval.txt /*break-finally*
browse() eval.txt /*browse()*
+browsedir() eval.txt /*browsedir()*
browsefilter editing.txt /*browsefilter*
bufexists() eval.txt /*bufexists()*
buffer-hidden windows.txt /*buffer-hidden*
@@ -4922,6 +4925,7 @@ hebrew hebrew.txt /*hebrew*
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*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 7cb6dbad69..a536f7c19e 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0aa. Last change: 2004 Oct 07
+*todo.txt* For Vim version 7.0aa. Last change: 2004 Oct 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,15 +30,8 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs*
-------------------- Known bugs and current work -----------------------
-Add browsedir(): like browse() but for directories.
- For GTK it already sort-of works when the default name is empty.
-
-When ":file" sets the alternate file name and it's empty this doesn't make
-sense. Could skip it, but would that break scripts that rely on the buffer to
-exist?
-
Folding support for 2html. (Carl Osterwisch, Oct 4)
-How to evaluate an expression in the sandbox?
+Now diff output!
Aborting at the ATTENTION prompt causes trouble:
buffer remains active, nwindows isn't closed (fixed in buffer.c)
@@ -58,13 +51,6 @@ Solved in os_mswin.c. Add to 6.3?
Patch for Win32 textdomain: NAKADAIRA Yukihiro, Sept 17.
-GTK 2 error message with this sequence (Namsh Oct 7):
- - start gvim with French locale
- - set enc=utf-8
- - :aunmenu *
- - :unlet did_install_default_menus
- - :source $VIMRUNTIME/menu.vim
-
Valencia: executable("xxd.exe") returns true while "!xxd" doesn't work.
Works fine for me. Only in specific environment?
@@ -372,6 +358,8 @@ Support ":enew filename" to edit a new buffer with a name. It's like "enew |
file filename" but without setting the alternate file to a buffer without a
name. (Charles Campbell)
+Add gui_mch_browsedir() for Motif, KDE and Mac OS/X.
+
Vi incompatibility:
9 In Ex mode, "u" undoes all changes, not just the last one. (John Cowan)
diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt
index 39ee4d25c5..b5484e9088 100644
--- a/runtime/doc/usr_21.txt
+++ b/runtime/doc/usr_21.txt
@@ -1,4 +1,4 @@
-*usr_21.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
+*usr_21.txt* For Vim version 7.0aa. Last change: 2004 Oct 10
VIM USER MANUAL - by Bram Moolenaar
@@ -65,7 +65,7 @@ a look at an overview:
:w !{program} execute {program} and send text to its input
:[range]!{program} filter text through {program}
-Notice that the presense of a range before "!{program}" makes a big
+Notice that the presence of a range before "!{program}" makes a big
difference. Without it executes the program normally, with the range a number
of text lines is filtered through the program.
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 7074532498..d947b93468 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0aa. Last change: 2004 Oct 07
+*version7.txt* For Vim version 7.0aa. Last change: 2004 Oct 11
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -48,6 +48,13 @@ Removed the old and incomplete "VimBuddy" code.
Buffers without a name report "No Name" instead of "No File". It was
confusing for buffers with a name and 'buftype' set to "nofile".
+When ":file xxx" is used in a buffer without a name, the alternate file name
+isn't set. This avoids creating buffers without a name that are not useful.
+
+The "2html.vim" script now converts closed folds to HTML. This means the HTML
+looks like its displayed, with the same folds open and closed. Use "zR" if no
+folds should appear in the HTML. (partly by Carl Osterwisch)
+
==============================================================================
NEW FEATURES *new-7*
@@ -124,13 +131,18 @@ Win32: The ":winpos" command now also works in the console. (Vipin Aravind)
|:delmarks| Delete marks.
+|:sandbox| Command modifier: execute the argument in the sandbox.
+
New functions: ~
+browsedir(title, init) |browsedir()| Dialog to select a directory.
byteidx(expr, nr) |byteidx()| Index of a character. (Ilya Sher)
finddir(name) |finddir()| Find a directory in 'path'.
findfile(name) |findfile()| Find a file in 'path'. (Johannes
Zellner)
+foldtextresult(lnum) |foldtextresult()| The text displayed for a closed
+ fold at line "lnum".
getfperm(fname) |getfperm()| Get file permission string. (Nikolai
Weibull)
getftype(fname) |getftype()| Get type of file. (Nikolai Weibull)
@@ -396,4 +408,11 @@ console version.
Win32 GUI: latin9 text (iso-8859-15) was not displayed correctly, because
there is no codepage for latin9. Do our own conversion from latin9 to UCS2.
+When two versions of GTK+ 2 are installed it was possible to use the header
+files from one and the library from the other. Use GTK_LIBDIR to put the
+directory for the library early in the link flags.
+
+With the GUI find/replace dialog a replace only worked if the pattern was
+literal text. Now it works for any pattern.
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 2afc09f930..25da291bd1 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
" Vim syntax support file
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2004 May 31
+" Last Change: 2004 Oct 10
" (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
" (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
@@ -238,40 +238,88 @@ else
let s:end = line("$")
endif
+" Closed folds are kept in the HTML. Prepare the closed fold template text.
+if has('folding')
+ let s:c = &fillchars[matchend(&fillchars, 'fold:')]
+ if s:c == ''
+ let s:c = '-'
+ endif
+ let s:htmlfoldtext = '+' . s:c
+ while strlen(s:htmlfoldtext) < &columns
+ let s:htmlfoldtext = s:htmlfoldtext . s:c
+ endwhile
+ unlet s:c
+endif
+
+
while s:lnum <= s:end
" Get the current line
let s:line = getline(s:lnum)
- let s:len = strlen(s:line)
let s:new = ""
- if s:numblines
- let s:new = '<span class="lnr">' . strpart(' ', 0, strlen(line("$")) - strlen(s:lnum)) . s:lnum . '</span> '
- endif
+ if has('folding') && foldclosed(s:lnum) > -1
+ "
+ " This is the beginning of a folded block
+ "
+ if s:numblines
+ let s:new = strpart(' ', 0, strlen(line("$")) - strlen(s:lnum)) . s:lnum . ' '
+ endif
+ let s:line = foldtextresult(s:lnum)
- " Loop over each character in the line
- let s:col = 1
- while s:col <= s:len
- let s:startcol = s:col " The start column for processing text
- let s:id = synID(s:lnum, s:col, 1)
- let s:col = s:col + 1
- " Speed loop (it's small - that's the trick)
- " Go along till we find a change in synID
- while s:col <= s:len && s:id == synID(s:lnum, s:col, 1) | let s:col = s:col + 1 | endwhile
-
- " Output the text with the same synID, with class set to {s:id_name}
- let s:id = synIDtrans(s:id)
- let s:id_name = synIDattr(s:id, "name", s:whatterm)
- let s:new = s:new . '<span class="' . s:id_name . '">' . substitute(substitute(substitute(substitute(substitute(strpart(s:line, s:startcol - 1, s:col - s:startcol), '&', '\&amp;', 'g'), '<', '\&lt;', 'g'), '>', '\&gt;', 'g'), '"', '\&quot;', 'g'), "\x0c", '<hr class="PAGE-BREAK">', 'g') . '</span>'
+ let s:new = s:new . s:line
+ if !exists("html_no_pre")
+ let s:new = s:new . strpart(s:htmlfoldtext, strlen(s:new))
+ endif
+
+ " Replace the reserved html characters
+ let s:new = substitute(substitute(substitute(substitute(substitute(s:new, '&', '\&amp;', 'g'), '<', '\&lt;', 'g'), '>', '\&gt;', 'g'), '"', '\&quot;', 'g'), "\x0c", '<hr class="PAGE-BREAK">', 'g')
+
+ let s:id_name = "Folded"
+ let s:id = hlID(s:id_name)
+ let s:new = '<span class="' . s:id_name . '">' . s:new . '</span>'
" Add the class to class list if it's not there yet
if stridx(s:idlist, "," . s:id . ",") == -1
let s:idlist = s:idlist . s:id . ","
endif
- if s:col > s:len
- break
+ " Skip to the end of the fold
+ let s:lnum = foldclosedend(s:lnum)
+
+ else
+ "
+ " A line that is not folded.
+ "
+ let s:len = strlen(s:line)
+
+ if s:numblines
+ let s:new = '<span class="lnr">' . strpart(' ', 0, strlen(line("$")) - strlen(s:lnum)) . s:lnum . '</span> '
endif
- endwhile
+
+ " Loop over each character in the line
+ let s:col = 1
+ while s:col <= s:len
+ let s:startcol = s:col " The start column for processing text
+ let s:id = synID(s:lnum, s:col, 1)
+ let s:col = s:col + 1
+ " Speed loop (it's small - that's the trick)
+ " Go along till we find a change in synID
+ while s:col <= s:len && s:id == synID(s:lnum, s:col, 1) | let s:col = s:col + 1 | endwhile
+
+ " Output the text with the same synID, with class set to {s:id_name}
+ let s:id = synIDtrans(s:id)
+ let s:id_name = synIDattr(s:id, "name", s:whatterm)
+ let s:new = s:new . '<span class="' . s:id_name . '">' . substitute(substitute(substitute(substitute(substitute(strpart(s:line, s:startcol - 1, s:col - s:startcol), '&', '\&amp;', 'g'), '<', '\&lt;', 'g'), '>', '\&gt;', 'g'), '"', '\&quot;', 'g'), "\x0c", '<hr class="PAGE-BREAK">', 'g') . '</span>'
+ " Add the class to class list if it's not there yet
+ if stridx(s:idlist, "," . s:id . ",") == -1
+ let s:idlist = s:idlist . s:id . ","
+ endif
+
+ if s:col > s:len
+ break
+ endif
+ endwhile
+ endif
" Expand tabs
let s:pad=0
diff --git a/runtime/syntax/slrnsc.vim b/runtime/syntax/slrnsc.vim
index 3f653cc4e6..838af6ad1c 100644
--- a/runtime/syntax/slrnsc.vim
+++ b/runtime/syntax/slrnsc.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Slrn score file (based on slrn 0.9.8.0)
-" Maintainer: Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
-" Last Change: 19 May 2004
+" Maintainer: Preben 'Peppe' Guldberg <peppe@wielders.org>
+" Last Change: 8 Oct 2004
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
@@ -48,7 +48,7 @@ syn region slrnscScoreItem contained matchgroup=Special start="^\s*\~\={::\=" en
syn keyword slrnscScore contained Score
syn match slrnscScoreIdent contained "%.*"
-syn match slrnScoreLine "^\s*Score::\=\s\+=\=-\=\d\+\s*\(%.*\)\=$" skipempty nextgroup=slrnscScoreItem contains=slrnscScore,slrnscDelim,slrnscOper,slrnscNumber,slrnscScoreIdent
+syn match slrnScoreLine "^\s*Score::\=\s\+=\=[-+]\=\d\+\s*\(%.*\)\=$" skipempty nextgroup=slrnscScoreItem contains=slrnscScore,slrnscDelim,slrnscOper,slrnscNumber,slrnscScoreIdent
" Define the default highlighting.
" For version 5.7 and earlier: only when not done already
diff --git a/src/auto/configure b/src/auto/configure
index 4b03c678b7..29bb14801e 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4761,6 +4761,7 @@ echo "configure:4759: checking for GTK - version >= $min_gtk_version" >&5
&& $PKG_CONFIG --exists gtk+-2.0; then
{
GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+ GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0`
GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
@@ -4772,6 +4773,7 @@ echo "configure:4759: checking for GTK - version >= $min_gtk_version" >&5
elif test "X$GTK_CONFIG" != "Xno"; then
{
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBDIR=
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
@@ -4796,7 +4798,7 @@ echo "configure:4759: checking for GTK - version >= $min_gtk_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 4800 "configure"
+#line 4802 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@@ -4828,7 +4830,7 @@ return 1;
}
EOF
-if { (eval echo configure:4832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -4850,7 +4852,8 @@ fi
else
echo "$ac_t""found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" 1>&6
fi
- GTK_LIBNAME="$GTK_LIBS"
+ GUI_LIB_LOC="$GTK_LIBDIR"
+ GTK_LIBNAME="$GTK_LIBS"
GUI_INC_LOC="$GTK_CFLAGS"
else
{
@@ -4886,12 +4889,13 @@ fi
{
min_gtk_version=1.1.16
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:4890: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:4893: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
&& $PKG_CONFIG --exists gtk+-2.0; then
{
GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+ GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0`
GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
@@ -4903,6 +4907,7 @@ echo "configure:4890: checking for GTK - version >= $min_gtk_version" >&5
elif test "X$GTK_CONFIG" != "Xno"; then
{
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBDIR=
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
@@ -4927,7 +4932,7 @@ echo "configure:4890: checking for GTK - version >= $min_gtk_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 4931 "configure"
+#line 4936 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@@ -4959,7 +4964,7 @@ return 1;
}
EOF
-if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -5077,7 +5082,7 @@ fi
if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then
{
echo $ac_n "checking for libgnomeui-2.0""... $ac_c" 1>&6
-echo "configure:5081: checking for libgnomeui-2.0" >&5
+echo "configure:5086: checking for libgnomeui-2.0" >&5
if $PKG_CONFIG --exists libgnomeui-2.0; then
echo "$ac_t""yes" 1>&6
GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
@@ -5096,7 +5101,7 @@ echo "configure:5081: checking for libgnomeui-2.0" >&5
# Extract the first word of "gnome-config", so it can be a program name with args.
set dummy gnome-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5100: checking for $ac_word" >&5
+echo "configure:5105: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5133,7 +5138,7 @@ fi
no_gnome_config="yes"
else
echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6
-echo "configure:5137: checking if $GNOME_CONFIG works" >&5
+echo "configure:5142: checking if $GNOME_CONFIG works" >&5
if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
echo "$ac_t""yes" 1>&6
GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`"
@@ -5158,7 +5163,7 @@ echo "configure:5137: checking if $GNOME_CONFIG works" >&5
if test "$no_gnome_config" = "yes"; then
echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
-echo "configure:5162: checking for gnomeConf.sh file in $gnome_prefix" >&5
+echo "configure:5167: checking for gnomeConf.sh file in $gnome_prefix" >&5
if test -f $gnome_prefix/gnomeConf.sh; then
echo "$ac_t""found" 1>&6
echo "loading gnome configuration from" \
@@ -5196,7 +5201,7 @@ if test -z "$SKIP_MOTIF"; then
GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
echo $ac_n "checking for location of Motif GUI includes""... $ac_c" 1>&6
-echo "configure:5200: checking for location of Motif GUI includes" >&5
+echo "configure:5205: checking for location of Motif GUI includes" >&5
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
@@ -5220,7 +5225,7 @@ fi
if test -z "$SKIP_MOTIF"; then
echo $ac_n "checking --with-motif-lib argument""... $ac_c" 1>&6
-echo "configure:5224: checking --with-motif-lib argument" >&5
+echo "configure:5229: checking --with-motif-lib argument" >&5
# Check whether --with-motif-lib or --without-motif-lib was given.
if test "${with_motif_lib+set}" = set; then
withval="$with_motif_lib"
@@ -5237,7 +5242,7 @@ fi
GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`"
echo $ac_n "checking for location of Motif GUI libs""... $ac_c" 1>&6
-echo "configure:5241: checking for location of Motif GUI libs" >&5
+echo "configure:5246: checking for location of Motif GUI libs" >&5
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
@@ -5280,11 +5285,11 @@ GUI_X_LIBS=
if test -z "$SKIP_ATHENA"; then
echo $ac_n "checking if Athena header files can be found""... $ac_c" 1>&6
-echo "configure:5284: checking if Athena header files can be found" >&5
+echo "configure:5289: checking if Athena header files can be found" >&5
cflags_save=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 5288 "configure"
+#line 5293 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -5293,7 +5298,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:5297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -5312,11 +5317,11 @@ fi
if test -z "$SKIP_NEXTAW"; then
echo $ac_n "checking if neXtaw header files can be found""... $ac_c" 1>&6
-echo "configure:5316: checking if neXtaw header files can be found" >&5
+echo "configure:5321: checking if neXtaw header files can be found" >&5
cflags_save=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 5320 "configure"
+#line 5325 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -5325,7 +5330,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:5329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -5353,7 +5358,7 @@ if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
ldflags_save=$LDFLAGS
LDFLAGS="$X_LIBS $LDFLAGS"
echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
-echo "configure:5357: checking for XShapeQueryExtension in -lXext" >&5
+echo "configure:5362: checking for XShapeQueryExtension in -lXext" >&5
ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5361,7 +5366,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5365 "configure"
+#line 5370 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5372,7 +5377,7 @@ int main() {
XShapeQueryExtension()
; return 0; }
EOF
-if { (eval echo configure:5376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5393,7 +5398,7 @@ else
fi
echo $ac_n "checking for wslen in -lw""... $ac_c" 1>&6
-echo "configure:5397: checking for wslen in -lw" >&5
+echo "configure:5402: checking for wslen in -lw" >&5
ac_lib_var=`echo w'_'wslen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5401,7 +5406,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5405 "configure"
+#line 5410 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5412,7 +5417,7 @@ int main() {
wslen()
; return 0; }
EOF
-if { (eval echo configure:5416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5433,7 +5438,7 @@ else
fi
echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:5437: checking for dlsym in -ldl" >&5
+echo "configure:5442: checking for dlsym in -ldl" >&5
ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5441,7 +5446,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5445 "configure"
+#line 5450 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -5452,7 +5457,7 @@ int main() {
dlsym()
; return 0; }
EOF
-if { (eval echo configure:5456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -5473,7 +5478,7 @@ else
fi
echo $ac_n "checking for XmuCreateStippledPixmap in -lXmu""... $ac_c" 1>&6
-echo "configure:5477: checking for XmuCreateStippledPixmap in -lXmu" >&5
+echo "configure:5482: checking for XmuCreateStippledPixmap in -lXmu" >&5
ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\"