diff options
author | Bram Moolenaar <Bram@vim.org> | 2004-07-03 16:05:59 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2004-07-03 16:05:59 +0000 |
commit | 592e0a2a1dbc542134c3fd88b4cdfa40e258f41b (patch) | |
tree | 40969df9b211be9ffd5523f7a9cc70e445cac973 | |
parent | cfbc5ee48e1b582f418f2d92ccbc4c4e84c803e1 (diff) |
updated for version 7.0005
-rw-r--r-- | runtime/doc/options.txt | 22 | ||||
-rw-r--r-- | runtime/doc/quickref.txt | 3 | ||||
-rw-r--r-- | runtime/doc/tags | 20 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 56 | ||||
-rw-r--r-- | runtime/doc/version7.txt | 8 | ||||
-rw-r--r-- | runtime/optwin.vim | 7 | ||||
-rw-r--r-- | src/Makefile | 11 | ||||
-rwxr-xr-x | src/auto/configure | 628 | ||||
-rw-r--r-- | src/configure.in | 1 | ||||
-rw-r--r-- | src/ex_cmds.c | 4 | ||||
-rw-r--r-- | src/ex_getln.c | 9 | ||||
-rw-r--r-- | src/feature.h | 1 | ||||
-rw-r--r-- | src/gui_mac.c | 205 | ||||
-rw-r--r-- | src/macros.h | 5 | ||||
-rw-r--r-- | src/memline.c | 3 | ||||
-rw-r--r-- | src/move.c | 4 | ||||
-rw-r--r-- | src/option.c | 36 | ||||
-rw-r--r-- | src/proto/screen.pro | 1 | ||||
-rw-r--r-- | src/screen.c | 68 | ||||
-rw-r--r-- | src/structs.h | 12 |
20 files changed, 739 insertions, 365 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 44b4d7b6df..a9e578518c 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 Jul 02 +*options.txt* For Vim version 7.0aa. Last change: 2004 Jul 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3881,8 +3881,8 @@ A jump table for the options with a short description can be found at |Q_op|. precedes:c Character to show in the first column, when 'wrap' is off and there is text preceding the character visible in the first column. - nbsp:c Character to show for non-breakable space. Left to - blank when omitted. + nbsp:c Character to show for a non-breakable space (character + 0xA0, 160). Left blank when omitted. The characters ':' and ',' should not be used. UTF-8 characters can be used when 'encoding' is "utf-8", otherwise only printable @@ -4260,10 +4260,26 @@ A jump table for the options with a short description can be found at |Q_op|. Print the line number in front of each line. When the 'n' option is excluded from 'cpoptions' a wrapped line will not use the column of line numbers (this is the default when 'compatible' isn't set). + The 'numberwidth' option can be used to set the room used for the line + number. When a long, wrapped line doesn't start with the first character, '-' characters are put before the number. See |hl-LineNr| for the highlighting used for the number. + *'numberwidth'* *'nuw'* +'numberwidth' 'nuw' number (Vim default: 4 Vi default: 8) + local to window + Minimal number of columns to use for the line number. Only relevant + when the 'number' option is set. + Since one space is always between the number and the text, there is + one less character for the number itself. + The value is the minimum width. A bigger width is used when needed to + fit the highest line number in the buffer. Thus with the Vim default + of 4 there is room for a line number up to 999. When the buffer has + 1000 lines five columns will be used. + The minimum value is 1, the maximum value is 10. + NOTE: 'numberwidth' is reset to 8 when 'compatible' is set. + *'osfiletype'* *'oft'* *E366* 'osfiletype' 'oft' string (RISC-OS default: "Text", others default: "") diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index db02b48550..8b3d86fc4c 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.0aa. Last change: 2004 Jul 02 +*quickref.txt* For Vim version 7.0aa. Last change: 2004 Jul 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -764,6 +764,7 @@ Short explanation of each option: *option-list* |'mousetime'| |'mouset'| max time between mouse double-click |'nrformats'| |'nf'| number formats recognized for CTRL-A command |'number'| |'nu'| print the line number in front of each line +|'numberwidth'| |'nuw'| number of columns used for the line number |'osfiletype'| |'oft'| operating system-specific filetype information |'paragraphs'| |'para'| nroff macros that separate paragraphs |'paste'| allow pasting text diff --git a/runtime/doc/tags b/runtime/doc/tags index 245a5c3681..4f5d6cda15 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -589,6 +589,8 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'nrformats' options.txt /*'nrformats'* 'nu' options.txt /*'nu'* 'number' options.txt /*'number'* +'numberwidth' options.txt /*'numberwidth'* +'nuw' options.txt /*'nuw'* 'oft' options.txt /*'oft'* 'op' vi_diff.txt /*'op'* 'open' vi_diff.txt /*'open'* @@ -4703,6 +4705,12 @@ g:explSuffixesLast pi_expl.txt /*g:explSuffixesLast* g:explUseSeparators pi_expl.txt /*g:explUseSeparators* g:explVertical pi_expl.txt /*g:explVertical* g:explWinSize pi_expl.txt /*g:explWinSize* +g:netrw_a pi_netrw.txt /*g:netrw_a* +g:netrw_list_cmd pi_netrw.txt /*g:netrw_list_cmd* +g:netrw_list_hide pi_netrw.txt /*g:netrw_list_hide* +g:netrw_rm_cmd pi_netrw.txt /*g:netrw_rm_cmd* +g:netrw_rmdir_cmd pi_netrw.txt /*g:netrw_rmdir_cmd* +g:netrw_rmf_cmd pi_netrw.txt /*g:netrw_rmf_cmd* g:var eval.txt /*g:var* g; motion.txt /*g;* g<Down> motion.txt /*g<Down>* @@ -5389,10 +5397,15 @@ netbeans-setup netbeans.txt /*netbeans-setup* netbeans-support netbeans.txt /*netbeans-support* netbeans.txt netbeans.txt /*netbeans.txt* netrw pi_netrw.txt /*netrw* +netrw-- pi_netrw.txt /*netrw--* +netrw-D pi_netrw.txt /*netrw-D* netrw-activate pi_netrw.txt /*netrw-activate* netrw-browse pi_netrw.txt /*netrw-browse* netrw-browse-var pi_netrw.txt /*netrw-browse-var* +netrw-c-l pi_netrw.txt /*netrw-c-l* +netrw-cadaver pi_netrw.txt /*netrw-cadaver* netrw-contents pi_netrw.txt /*netrw-contents* +netrw-cr pi_netrw.txt /*netrw-cr* netrw-credits pi_netrw.txt /*netrw-credits* netrw-debug pi_netrw.txt /*netrw-debug* netrw-delete pi_netrw.txt /*netrw-delete* @@ -5400,20 +5413,27 @@ netrw-dir pi_netrw.txt /*netrw-dir* netrw-ex pi_netrw.txt /*netrw-ex* netrw-file pi_netrw.txt /*netrw-file* netrw-fixup pi_netrw.txt /*netrw-fixup* +netrw-ftp pi_netrw.txt /*netrw-ftp* +netrw-h pi_netrw.txt /*netrw-h* +netrw-help pi_netrw.txt /*netrw-help* netrw-history pi_netrw.txt /*netrw-history* netrw-list pi_netrw.txt /*netrw-list* netrw-list-hack pi_netrw.txt /*netrw-list-hack* netrw-move pi_netrw.txt /*netrw-move* netrw-netrc pi_netrw.txt /*netrw-netrc* +netrw-o pi_netrw.txt /*netrw-o* netrw-options pi_netrw.txt /*netrw-options* netrw-passwd pi_netrw.txt /*netrw-passwd* netrw-protocol pi_netrw.txt /*netrw-protocol* +netrw-r pi_netrw.txt /*netrw-r* netrw-ref pi_netrw.txt /*netrw-ref* netrw-remove pi_netrw.txt /*netrw-remove* netrw-rename pi_netrw.txt /*netrw-rename* +netrw-s pi_netrw.txt /*netrw-s* netrw-transparent pi_netrw.txt /*netrw-transparent* netrw-uidpass pi_netrw.txt /*netrw-uidpass* netrw-urls pi_netrw.txt /*netrw-urls* +netrw-v pi_netrw.txt /*netrw-v* netrw-var pi_netrw.txt /*netrw-var* netrw-x pi_netrw.txt /*netrw-x* netrw-xfer pi_netrw.txt /*netrw-xfer* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index c11a12563a..0fe73b8241 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 Jul 02 +*todo.txt* For Vim version 7.0aa. Last change: 2004 Jul 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,32 +30,10 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- +Docs for 'numberwidth'. index. optwin.vim + For version 7.0: - Include many PATCHES: - 7 Add "nbsp" in 'listchars'? Patch from David Blanchet, 2003 Jul 28. - again 2004 Jun 16 - 8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible. - Aric Blumer has a patch for this. - He will update the patch for 6.3. - 9 Add cursor-column highlighting. Enable it with 'cursorcolumn' option, - set highlighting with "CursorColumn" group. Useful for aligning text. - Also cursor-row highlighting. Patch from Yasuhiro Matsumoto for - underlining the cursor line, 2004 Mar 24. Update 2004 Jun 17 - Alternatie: when 'number' is set highlight the number of the current - line. - 7 Completion of network shares, patch by Yasuhiro Matsumoto. - Update 2004 Jun 17. - 8 Patches from Peter "Rain Dog" Cucka: - - guifont selector (2002 Dec 15) - update 2004 Jun 20 - 7 Add an option to set the width of the 'number' column. Eight - positions is often more than needed. Or adjust the width to the - length of the file? - Add patch that adds 'numberlen' option. (James Harvey) - Other patch with min and max from Emmanuel Renieris (2002 Jul 24) - Other patch without an option by Gilles Roy (2002 Jul 25) - New patch from Emmanuel Renieris, 2004 Jun 17 - Needs more work: use one option with one or two numbers 7 Be able to call a function while passing on a variable number of arguments: :function Foo(abc, ...) @@ -88,6 +66,9 @@ For version 7.0: Resp: no time now. 8 Add GTK 2.3 file dialog support. Patch by Grahame Bowland, 2004 Mar 15, but it doesn't use "initdir" or "dflt". (will update patch) + 8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible. + Aric Blumer has a patch for this. + He will update the patch for 6.3. 8 Add buffer-local autocommands? Reduces overhead for autocommands that trigger often (inserting a character, switching mode). :au Event <buffer> do-something @@ -100,6 +81,13 @@ For version 7.0: VimResized - When the Vim window has been resized (SIGWINCH) patch from Yakov Lerner, 2003 July 24. He'll write documentation and send updated patch. + 7 Completion of network shares, patch by Yasuhiro Matsumoto. + Update 2004 Jun 17. + How does this work? Missing comments. + gettext() Translate a message. (Patch from Yasuhiro Matsumoto) + Update 2004 Jun 17 + Missing docs. Search in 'runtimepath'? + How to get the messages into the .po files? --- responses above -- 7 Make "5dd" on last-but-one-line not delete anything (Vi compatible). Add flag in 'cpoptions' for this. When not present, "2dd" in the last @@ -152,10 +140,6 @@ For version 7.0: find() find file in 'path' (patch from Johannes Zellner 2001 Dec 20) Update 2004 Jun 16. - gettext() Translate a message. (Patch from Yasuhiro - Matsumoto) How to get the messages into the - .po files? - Update 2004 Jun 17 realname() Get user name (first, last, full) user_fullname() patch by Nikolai Weibull, Nov 3 2002) @@ -221,6 +205,7 @@ For version 7.0: - In the kvim/KDE source files fix the formatting. - KDE version is called "kvim". Make it "gvim", like the others? +- Better configure check for KDE include files from Dan Sharp. - Change ga_room into ga_maxlen, so that it doesn't need to be incremented/decremented each time. - For string variables, use length instead of NUL termination. @@ -289,10 +274,15 @@ For version 7.0: - Mac: Unicode input and display (Eckehard Berns, June 27) 8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac? New patch 2004 Jun 16 -7 Add the MzScheme interface? - NO: it changes too much of the code, while hardly anybody will use it. - Patch on http://iamphet.nm.ru/scheme/ (Sergey Khorev) - Alt URL: http://cyber.miem.edu.ru/~iamphet/scheme/mzvim-0.560.tar.gz +7 Add the MzScheme interface? New patch 2004 Jul 2. (Sergey Khorev) + Also fix a few Lisp problems. +9 Add cursor-column highlighting. Enable it with 'cursorcolumn' option, + set highlighting with "CursorColumn" group. Useful for aligning text. + Also cursor-row highlighting. Patch from Yasuhiro Matsumoto for + underlining the cursor line: 2004 Jun 17. Should use highlight group + instead. + Alternative: when 'number' is set highlight the number of the current + line. Vi incompatibility: 8 With undo/redo only marks in the changed lines should be changed. Other diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index a3797ba600..e30217a18a 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 Jul 02 +*version7.txt* For Vim version 7.0aa. Last change: 2004 Jul 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -86,6 +86,8 @@ Options: ~ mode to do any kind of completion. (Taro Muraoka) 'quoteescape' Characters used to escape quotes inside a string. Used for the a", a' and a` text objects. |a'| +'numberwidth' Minimal width of the space used for the 'number' + option. (Emmanuel Renieris) Ex commands: ~ @@ -116,6 +118,8 @@ character selections can be used between two Vims. (Eckehard Berns) Also fixes the problem that setting 'clipboard' to "unnamed" breaks using "yyp". +Mac: GUI font selector. (Peter "Rain Dog" Cucka) + The netrw plugin now also supports viewing a directory, when "scp://" is used. Deleting and renaming files is possible. (Charles Campbell) @@ -133,6 +137,8 @@ few more important commands. Used ideas from Gabriel Zachmann. Unix: When libcall() fails obtain an error message with dlerror() and display it. (Johannes Zellner) +Added "nbsp" in 'listchars'. (David Blanchet) + ============================================================================== COMPILE TIME CHANGES *compile-changes-7* diff --git a/runtime/optwin.vim b/runtime/optwin.vim index bc70fcdf19..82e2c0ca8d 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2004 Jul 02 +" Last Change: 2004 Jul 03 " If there already is an option window, jump to that one. if bufwinnr("option-window") > 0 @@ -359,6 +359,11 @@ call <SID>OptionG("lcs", &lcs) call append("$", "number\tshow the line number for each line") call append("$", "\t(local to window)") call <SID>BinOptionL("nu") +if has("linebreak") + call append("$", "numberwidth\tnumber of columns to use for the line number") + call append("$", "\t(local to window)") + call <SID>OptionL("nuw") +endif call <SID>Header("syntax and highlighting") diff --git a/src/Makefile b/src/Makefile index e19dabc5b5..e5d9d89a52 100644 --- a/src/Makefile +++ b/src/Makefile @@ -497,7 +497,7 @@ CClink = $(CC) #CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes #CFLAGS = -O6 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes -#CFLAGS = -g -O2 -DSTARTUPTIME=\"vimstartup\" -fno-strength-reduce -Wall -Wmissing-prototypes +#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond # allocated memory (and makes every malloc()/free() very slow). @@ -1492,8 +1492,11 @@ config auto/config.mk: auto/configure config.mk.in config.h.in # Use "make reconfig" to rerun configure without cached values. # When config.h changes, most things will be recompiled automatically. -# Use "myself" to make "all" with a possibly changed auto/config.mk. -reconfig: scratch clean config myself +# Invoke $(MAKE) to run config with the empty auto/config.mk. +# Invoke $(MAKE) to build all with the filled auto/config.mk. +reconfig: scratch clean + $(MAKE) -f Makefile config + $(MAKE) -f Makefile all # Run autoconf to produce auto/configure. # Note: @@ -2413,9 +2416,11 @@ objects/gui_kde_widget.o: gui_kde_widget.cc $(KDE_DIR)/bin/dcopidl2cpp --c++-suffix cc --no-stub kvim_iface.kidl $(CCC) -o $@ gui_kde_widget.cc +gui_kde_widget_moc.cc: objects/gui_kde_widget.o objects/gui_kde_widget_moc.o: gui_kde_widget_moc.cc $(CCC) -o $@ gui_kde_widget_moc.cc +kvim_iface_skel.cc: objects/gui_kde_widget.o objects/kvim_iface_skel.o: kvim_iface_skel.cc $(CCC) -o $@ kvim_iface_skel.cc diff --git a/src/auto/configure b/src/auto/configure index e9e5637f24..62171f2c73 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -3727,6 +3727,7 @@ enable_gui_canon=`echo "_$enable_gui" | \ SKIP_GTK=YES SKIP_GTK2=YES SKIP_GNOME=YES +SKIP_KDE=YES SKIP_MOTIF=YES SKIP_ATHENA=YES SKIP_NEXTAW=YES @@ -3810,7 +3811,7 @@ fi if test "x$SKIP_KDE" != "xYES" -a "$enable_gui_canon" != "kde"; then echo $ac_n "checking whether or not to look for KDE""... $ac_c" 1>&6 -echo "configure:3814: checking whether or not to look for KDE" >&5 +echo "configure:3815: checking whether or not to look for KDE" >&5 # Check whether --enable-kde-check or --disable-kde-check was given. if test "${enable_kde_check+set}" = set; then enableval="$enable_kde_check" @@ -3827,7 +3828,7 @@ fi if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a "$enable_gui_canon" != "gtk2"; then echo $ac_n "checking whether or not to look for GTK""... $ac_c" 1>&6 -echo "configure:3831: checking whether or not to look for GTK" >&5 +echo "configure:3832: checking whether or not to look for GTK" >&5 # Check whether --enable-gtk-check or --disable-gtk-check was given. if test "${enable_gtk_check+set}" = set; then enableval="$enable_gtk_check" @@ -3846,7 +3847,7 @@ fi if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \ -a "$enable_gui_canon" != "gnome2"; then echo $ac_n "checking whether or not to look for GTK+ 2""... $ac_c" 1>&6 -echo "configure:3850: checking whether or not to look for GTK+ 2" >&5 +echo "configure:3851: checking whether or not to look for GTK+ 2" >&5 # Check whether --enable-gtk2-check or --disable-gtk2-check was given. if test "${enable_gtk2_check+set}" = set; then enableval="$enable_gtk2_check" @@ -3864,7 +3865,7 @@ fi if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome" \ -a "$enable_gui_canon" != "gnome2"; then echo $ac_n "checking whether or not to look for GNOME""... $ac_c" 1>&6 -echo "configure:3868: checking whether or not to look for GNOME" >&5 +echo "configure:3869: checking whether or not to look for GNOME" >&5 # Check whether --enable-gnome-check or --disable-gnome-check was given. if test "${enable_gnome_check+set}" = set; then enableval="$enable_gnome_check" @@ -3881,7 +3882,7 @@ fi if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then echo $ac_n "checking whether or not to look for Motif""... $ac_c" 1>&6 -echo "configure:3885: checking whether or not to look for Motif" >&5 +echo "configure:3886: checking whether or not to look for Motif" >&5 # Check whether --enable-motif-check or --disable-motif-check was given. if test "${enable_motif_check+set}" = set; then enableval="$enable_motif_check" @@ -3898,7 +3899,7 @@ fi if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then echo $ac_n "checking whether or not to look for Athena""... $ac_c" 1>&6 -echo "configure:3902: checking whether or not to look for Athena" >&5 +echo "configure:3903: checking whether or not to look for Athena" >&5 # Check whether --enable-athena-check or --disable-athena-check was given. if test "${enable_athena_check+set}" = set; then enableval="$enable_athena_check" @@ -3915,7 +3916,7 @@ fi if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then echo $ac_n "checking whether or not to look for neXtaw""... $ac_c" 1>&6 -echo "configure:3919: checking whether or not to look for neXtaw" >&5 +echo "configure:3920: checking whether or not to look for neXtaw" >&5 # Check whether --enable-nextaw-check or --disable-nextaw-check was given. if test "${enable_nextaw_check+set}" = set; then enableval="$enable_nextaw_check" @@ -3932,7 +3933,7 @@ fi if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then echo $ac_n "checking whether or not to look for Carbon""... $ac_c" 1>&6 -echo "configure:3936: checking whether or not to look for Carbon" >&5 +echo "configure:3937: checking whether or not to look for Carbon" >&5 # Check whether --enable-carbon-check or --disable-carbon-check was given. if test "${enable_carbon_check+set}" = set; then enableval="$enable_carbon_check" @@ -3966,7 +3967,7 @@ if test "x$ROOTQT" = "x"; then # Extract the first word of "moc", so it can be a program name with args. set dummy moc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3970: checking for $ac_word" >&5 +echo "configure:3971: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4036,7 +4037,7 @@ if test "x$QT_INCLUDES" = "x" ; then fi echo $ac_n "checking whether or not to use a KDE Toolbar in KVim""... $ac_c" 1>&6 -echo "configure:4040: checking whether or not to use a KDE Toolbar in KVim" >&5 +echo "configure:4041: checking whether or not to use a KDE Toolbar in KVim" >&5 # Check whether --enable-kde-toolbar or --disable-kde-toolbar was given. if test "${enable_kde_toolbar+set}" = set; then enableval="$enable_kde_toolbar" @@ -4059,7 +4060,7 @@ if test -z "$SKIP_KDE"; then echo $ac_n "checking --disable-rpath argument""... $ac_c" 1>&6 -echo "configure:4063: checking --disable-rpath argument" >&5 +echo "configure:4064: checking --disable-rpath argument" >&5 # Check whether --enable-rpath or --disable-rpath was given. if test "${enable_rpath+set}" = set; then enableval="$enable_rpath" @@ -4075,7 +4076,7 @@ else fi echo $ac_n "checking --with-kde-prefix argument""... $ac_c" 1>&6 -echo "configure:4079: checking --with-kde-prefix argument" >&5 +echo "configure:4080: checking --with-kde-prefix argument" >&5 # Check whether --with-kde-prefix or --without-kde-prefix was given. if test "${with_kde_prefix+set}" = set; then withval="$with_kde_prefix" @@ -4103,7 +4104,7 @@ fi echo $ac_n "checking --disable-kdetest argument""... $ac_c" 1>&6 -echo "configure:4107: checking --disable-kdetest argument" >&5 +echo "configure:4108: checking --disable-kdetest argument" >&5 # Check whether --enable-kdetest or --disable-kdetest was given. if test "${enable_kdetest+set}" = set; then enableval="$enable_kdetest" @@ -4126,7 +4127,7 @@ if test "X$KDE_CONFIG" = "X"; then # Extract the first word of "kde-config", so it can be a program name with args. set dummy kde-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4130: checking for $ac_word" >&5 +echo "configure:4131: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KDE_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4168,7 +4169,7 @@ if test "X$KDE_CONFIG" != "X" ; then if test "X$KDE_CONFIG" != "X"; then min_kde_version=2.0.0 echo $ac_n "checking for KDE version >= $min_kde_version""... $ac_c" 1>&6 -echo "configure:4172: checking for KDE version >= $min_kde_version" >&5 +echo "configure:4173: checking for KDE version >= $min_kde_version" >&5 no_kde="" if test "$KDE_CONFIG" = "no" ; then no_kde=yes @@ -4178,7 +4179,10 @@ echo "configure:4172: checking for KDE version >= $min_kde_version" >&5 KDE_LIBS="$KDE_PREFIX/lib" fi if test "x$KDE_INCLUDES" = "x"; then - KDE_INCLUDES="$KDE_PREFIX/include" + KDE_INCLUDES="$KDE_PREFIX/include" + if test -d "$KDE_INCLUDES/kde"; then + KDE_INCLUDES="$KDE_INCLUDES/kde" + fi fi kde_major_version=`$KDE_CONFIG --version | grep KDE | \ sed 's/KDE:\ //' | sed 's/\([0-9]*\).\([0-9]*.*\)/\1/'` @@ -4198,7 +4202,7 @@ sed 's/KDE:\ //' | sed 's/\([0-9]*\).\([0-9]*.*\)/\2/'` echo $ac_n "cross compiling KDE ? ? how can i remove that ? :)" else cat > conftest.$ac_ext <<EOF -#line 4202 "configure" +#line 4206 "configure" #include "confdefs.h" #include <stdio.h> @@ -4207,7 +4211,7 @@ main() { return 0; } EOF -if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4243,7 +4247,7 @@ fi if test "x$KDE_PREFIX" != "x"; then echo $ac_n "checking for QT version $qt_major_version.x""... $ac_c" 1>&6 -echo "configure:4247: checking for QT version $qt_major_version.x" >&5 +echo "configure:4251: checking for QT version $qt_major_version.x" >&5 if test "x$ROOTQT" != "x" ; then GUI_INC_LOC="-I$QT_INCLUDES $GUI_INC_LOC" if test $qt_major_version -lt 2; then @@ -4299,7 +4303,7 @@ fi if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then echo $ac_n "checking for Carbon GUI""... $ac_c" 1>&6 -echo "configure:4303: checking for Carbon GUI" >&5 +echo "configure:4307: checking for Carbon GUI" >&5 echo "$ac_t""yes" 1>&6; GUITYPE=CARBONGUI SKIP_GTK=YES; @@ -4324,7 +4328,7 @@ fi if test -z "$SKIP_GTK"; then echo $ac_n "checking --with-gtk-prefix argument""... $ac_c" 1>&6 -echo "configure:4328: checking --with-gtk-prefix argument" >&5 +echo "configure:4332: checking --with-gtk-prefix argument" >&5 # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then withval="$with_gtk_prefix" @@ -4335,7 +4339,7 @@ fi echo $ac_n "checking --with-gtk-exec-prefix argument""... $ac_c" 1>&6 -echo "configure:4339: checking --with-gtk-exec-prefix argument" >&5 +echo "configure:4343: checking --with-gtk-exec-prefix argument" >&5 # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. if test "${with_gtk_exec_prefix+set}" = set; then withval="$with_gtk_exec_prefix" @@ -4346,7 +4350,7 @@ fi echo $ac_n "checking --disable-gtktest argument""... $ac_c" 1>&6 -echo "configure:4350: checking --disable-gtktest argument" >&5 +echo "configure:4354: checking --disable-gtktest argument" >&5 # Check whether --enable-gtktest or --disable-gtktest was given. if test "${enable_gtktest+set}" = set; then enableval="$enable_gtktest" @@ -4373,7 +4377,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4377: checking for $ac_word" >&5 +echo "configure:4381: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4410,7 +4414,7 @@ fi # Extract the first word of "gtk12-config", so it can be a program name with args. set dummy gtk12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4414: checking for $ac_word" >&5 +echo "configure:4418: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4452,7 +4456,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4456: checking for $ac_word" >&5 +echo "configure:4460: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4494,7 +4498,7 @@ fi { min_gtk_version=2.2.0 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:4498: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:4502: 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 @@ -4535,7 +4539,7 @@ echo "configure:4498: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext <<EOF -#line 4539 "configure" +#line 4543 "configure" #include "confdefs.h" #include <gtk/gtk.h> @@ -4567,7 +4571,7 @@ return 1; } EOF -if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4625,7 +4629,7 @@ fi { min_gtk_version=1.1.16 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:4629: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:4633: 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 @@ -4666,7 +4670,7 @@ echo "configure:4629: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext <<EOF -#line 4670 "configure" +#line 4674 "configure" #include "confdefs.h" #include <gtk/gtk.h> @@ -4698,7 +4702,7 @@ return 1; } EOF -if { (eval echo configure:4702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4816,7 +4820,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:4820: checking for libgnomeui-2.0" >&5 +echo "configure:4824: 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` @@ -4835,7 +4839,7 @@ echo "configure:4820: 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:4839: checking for $ac_word" >&5 +echo "configure:4843: 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 @@ -4872,7 +4876,7 @@ fi no_gnome_config="yes" else echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 -echo "configure:4876: checking if $GNOME_CONFIG works" >&5 +echo "configure:4880: 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`" @@ -4897,7 +4901,7 @@ echo "configure:4876: 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:4901: checking for gnomeConf.sh file in $gnome_prefix" >&5 +echo "configure:4905: 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" \ @@ -4935,7 +4939,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:4939: checking for location of Motif GUI includes" >&5 +echo "configure:4943: 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 @@ -4959,7 +4963,7 @@ fi if test -z "$SKIP_MOTIF"; then echo $ac_n "checking --with-motif-lib argument""... $ac_c" 1>&6 -echo "configure:4963: checking --with-motif-lib argument" >&5 +echo "configure:4967: 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" @@ -4976,7 +4980,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:4980: checking for location of Motif GUI libs" >&5 +echo "configure:4984: 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 @@ -5019,11 +5023,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:5023: checking if Athena header files can be found" >&5 +echo "configure:5027: checking if Athena header files can be found" >&5 cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext <<EOF -#line 5027 "configure" +#line 5031 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -5032,7 +5036,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -5051,11 +5055,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:5055: checking if neXtaw header files can be found" >&5 +echo "configure:5059: checking if neXtaw header files can be found" >&5 cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext <<EOF -#line 5059 "configure" +#line 5063 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -5064,7 +5068,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -5092,7 +5096,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:5096: che |