diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/INSTALLmac.txt | 111 | ||||
-rw-r--r-- | src/Makefile | 99 | ||||
-rwxr-xr-x | src/auto/configure | 996 | ||||
-rw-r--r-- | src/configure.in | 331 | ||||
-rw-r--r-- | src/edit.c | 14 | ||||
-rw-r--r-- | src/ex_cmds2.c | 7 | ||||
-rw-r--r-- | src/ex_getln.c | 3 | ||||
-rw-r--r-- | src/feature.h | 23 | ||||
-rw-r--r-- | src/fileio.c | 5 | ||||
-rw-r--r-- | src/globals.h | 9 | ||||
-rw-r--r-- | src/gui.c | 32 | ||||
-rw-r--r-- | src/gui.h | 41 | ||||
-rw-r--r-- | src/mbyte.c | 27 | ||||
-rw-r--r-- | src/misc2.c | 2 | ||||
-rw-r--r-- | src/option.c | 10 | ||||
-rw-r--r-- | src/option.h | 6 | ||||
-rw-r--r-- | src/os_macosx.c | 6 | ||||
-rw-r--r-- | src/os_unix.c | 14 | ||||
-rw-r--r-- | src/screen.c | 18 | ||||
-rw-r--r-- | src/structs.h | 3 | ||||
-rw-r--r-- | src/version.c | 4 | ||||
-rw-r--r-- | src/version.h | 4 |
22 files changed, 84 insertions, 1681 deletions
diff --git a/src/INSTALLmac.txt b/src/INSTALLmac.txt index 8b944c3799..adb1ca1638 100644 --- a/src/INSTALLmac.txt +++ b/src/INSTALLmac.txt @@ -15,12 +15,7 @@ Summary 1.1. Carbon interface 1.2. X (Athena, GTK, Motif) or plain text. -2 MacOS Classic - 2.1. CodeWarrior - 2.2. MPW - -NOTE: The Carbon version can only be compiled properly under - MacOS X. +MacOS Classic is no longer supported. If you really want it use Vim 6.4. ---------------------------------------------------------------------------- 1 MacOS X @@ -57,108 +52,4 @@ NOTE: The Carbon version can only be compiled properly under NOTE: You need to first install XFree86 and XDarwin. Please visit http://www.XDarwin.org ----------------------------------------------------------------------------- -MacOS 9 ----------------------------------------------------------------------------- - -Both ':' and '/' supported as path separator. - -2.1: Compiling with CodeWarior - - 1. Expand the resource file: - open ../src/os_mac.rsr.hqx to produce ../src/gui_mac.rsrc: - % cd vim62/src - % open -a StuffIt\ Expander os_mac.rsr.hqx - - 2. Expand the project file: - - ../src/os_mac.sit.hqx (to produce ../src/vim.mcp) - - 3. Open vim.mcp with CodeWarior - - This is a CodeWarior 9 project file. When using a newer version, - you need to convert the file. you may also need to change some - access path. - - NOTE: the current project file is old, you need to add a few files: - (ex_cmds2.c, fold.c, mbyte.c, move.c) - - 4. Select the target PPC, 68k FAT (with/without debugger) - - 5. Compile - -2.2: Compiling with MPW. - - 0. You will need a recent version of the MPW and the Universal Interfaces. - You can get both at: - ftp://ftp.apple.com/developer/Tool_Chest/Interfaces-Libraries/ - ftp://ftp.apple.com/developer/Tool_Chest/Core_Mac_OS_Tools/ - For a Carbon version you will need a recent Carbon SDK as well. - (When you have an older version already installed you not be able to - compile a carbon version. Update "CreateMake" which is available at - Apple. - - 1. Expand the resource file: - open ../src/os_mac.rsr.hqx to produce ../src/gui_mac.rsrc: - % cd vim62/src - % open -a StuffIt\ Expander os_mac.rsr.hqx - - 3. Double click on os_make.make, the MPW will now open in the correct - folder and load the CreateVimMake script. Change to the Worksheet - window. Type "os_mac.build" and hit Enter (not Return). A dialog box - will appear. Select the target you want. (Vim-68k, Vim-ppc, Vim-carbon) - - 4. Select "Build" from the menu (or type command-B). Type the program name - into the dialog box. - ------------------------------------------------------ - -OLD FILE: SOME INFO MAY STILL BE USEFUL - -NOTE: Users of more recent CodeWarrior version may have to reset the library - path, and change the mch_delay in os_mac.c so the finalTick is unsigned. - -Compilation instructions: - -1. Visit the Vim ftp site (see ftp://ftp.vim.org/pub/vim/MIRRORS) - and obtain the following five files: - - unix/vim-X.X-src1.tar.gz - unix/vim-X.X-src2.tar.gz - unix/vim-X.X-rt1.tar.gz - unix/vim-X.X-rt2.tar.gz - extra/vim-X.X-extra.tar.gz - - where X.X is the version number. - - NOTE: the language support is not yet supported - -2. Expand the archives. - -3. Apply patches if they exist. (Patch files are found in the ftp - site in the "patches" directory.) - -4. Edit vim-X.X/src/feature.h for your preference. (You can skip - this, then you will get the default behavior as is documented, - which should be fine for most people.) - - For example, if you want to add the FEAT_MBYTE feature, turn on - #define FEAT_MBYTE - -5. Expand the resource file: - - - vim-X.X/src/os_mac.rsr.hqx (to produce vim-X.X/src/gui_mac.rsrc) - -6. If using CodeWarrior, expand the project file: - - - vim-X.X/src/os_mac.sit.hqx (to produce vim-X.X/src/vim.mcp) - - The latter file is the CodeWarrior project file to be used. - -7. Launch CodeWarrior by double clicking vim.mcp. - -8. Check additional files if you include non-standard features. - - For example, if you added the MULTI_BYTE feature, check - Extras/mbyte.c in the project window. - -9. Compile and you will obtain binaries: vimPPC, Vim 68k, and/or vimFAT. diff --git a/src/Makefile b/src/Makefile index 56ab707a3a..8dd1be3e6e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -34,7 +34,7 @@ # X11 Session Management Protocol (XSMP) library (libSM) but do not # want to use it. # This can speedup Vim startup but Vim loses the ability to catch the -# user logging out from session-managers like GNOME & KDE and work +# user logging out from session-managers like GNOME and work # could be lost. # - Uncomment one or more of these lines to include an interface; # each makes Vim quite a bit bigger: @@ -338,8 +338,6 @@ CClink = $(CC) # automatically be used if it is found. If you have GNOME, but do not want to # use it (e.g., want a GTK-only version), then use --enable-gui=gtk. # -# KDE doesn't fully work, unfortunately. See the todo list. -# # If the selected GUI isn't found, the GUI is disabled automatically #CONF_OPT_GUI = --enable-gui=gtk #CONF_OPT_GUI = --enable-gui=gtk --disable-gtktest @@ -348,7 +346,6 @@ CClink = $(CC) #CONF_OPT_GUI = --enable-gui=gnome #CONF_OPT_GUI = --enable-gui=gnome2 #CONF_OPT_GUI = --enable-gui=gnome2 --disable-gtktest -#CONF_OPT_GUI = --enable-gui=kde #CONF_OPT_GUI = --enable-gui=motif #CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared" #CONF_OPT_GUI = --enable-gui=athena @@ -1087,23 +1084,6 @@ LINKIT = @echo >/dev/null # Without a GUI install the normal way. NONE_INSTALL = install_normal -### KDE GUI interface. -KDE_SRC = gui.c pty.c gui_kde.cc gui_kde_x11.cc gui_kde_wid.cc gui_kde_wid_moc.cc kvim_iface_skel.cc -KDE_OBJ = objects/gui.o objects/pty.o objects/gui_kde.o objects/gui_kde_x11.o \ - objects/gui_kde_wid.o objects/gui_kde_wid_moc.o \ - objects/kvim_iface_skel.o -KDE_DEFS = -DFEAT_GUI_KDE $(NARROW_PROTO) -KDE_IPATH = $(GUI_INC_LOC) -KDE_LIBS_DIR = $(GUI_LIB_LOC) # Includes the libraries themselves -KDE_DIR = $(KDE_PREFIX) -KDE_LIBS1 = -KDE_LIBS2 = -KDE_INSTALL = install_normal -KDE_TARGETS = installglinks installkdeicons -KDE_MAN_TARGETS = yes -KDE_TESTTARGET = gui -KDE_BUNDLE = - ### GTK GUI GTK_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \ gui_beval.c @@ -1230,7 +1210,7 @@ APPDIR = $(VIMNAME).app CARBONGUI_TESTARG = VIMPROG=../$(APPDIR)/Contents/MacOS/$(VIMTARGET) # All GUI files -ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c gui_kde.cc gui_kde_wid.cc gui_kde_x11.cc gui_kde_wid_moc.cc +ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c ALL_GUI_PRO = gui.pro gui_gtk.pro gui_motif.pro gui_xmdlg.pro gui_athena.pro gui_gtk_x11.pro gui_x11.pro gui_w16.pro gui_w32.pro gui_photon.pro # }}} @@ -1277,7 +1257,7 @@ PROTO_FLAGS = -m -M__ARGS -d -E"$(CPP)" $(NO_ATTR) SHELL = /bin/sh .SUFFIXES: -.SUFFIXES: .cc .c .o .pro +.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) @@ -1395,7 +1375,7 @@ SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) $(MZSCHEME_SRC) \ $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) $(RUBY_SRC) \ $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) -TAGS_SRC = *.c *.cpp *.cc if_perl.xs +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 \ @@ -1947,23 +1927,6 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP) chmod $(FILEMOD) $(DEST_KMAP)/README.txt $(DEST_KMAP)/*.vim; \ fi -# Install the icons for the KDE GUI. This differs from the KDE icons for -# other GUIs. -installkdeicons: - mkdir -p $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/16x16/actions/ - mkdir -p $(DESTDIR)$(KDE_DIR)/share/apps/kvim - - cp ../runtime/KVim.desktop $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/ && chmod 644 $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/KVim.desktop - cp ../runtime/kvim32x32.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/kvim.png - cp ../runtime/kvim48x48.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/kvim.png && chmod 644 $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/48x48/apps/kvim.png - cp ../runtime/hi16-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/16x16/actions/hi16-action-make.png - cp ../runtime/hi22-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/hi22-action-make.png - cp ../runtime/kde-tips $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips && chmod 644 $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips - # install the icons for KDE, if the directory exists and the icon doesn't. ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps @@ -2145,7 +2108,6 @@ clean celan: testclean -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c -rm -f conftest* *~ auto/link.sed -rm -rf $(APPDIR) - -rm -f gui_kde_wid_moc.cc kvim_iface_skel.cc *.kidl if test -d $(PODIR); then \ cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \ fi @@ -2239,9 +2201,6 @@ lintinstall: .c.o: $(CCC) $< -.cc.o: - $(CCC) $< - auto/if_perl.c: if_perl.xs $(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@ $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \ @@ -2512,26 +2471,6 @@ objects/workshop.o: workshop.c objects/wsdebug.o: wsdebug.c $(CCC) -o $@ wsdebug.c -objects/gui_kde.o: gui_kde.cc - $(CCC) -o $@ gui_kde.cc - -objects/gui_kde_x11.o: gui_kde_x11.cc - $(CCC) -o $@ gui_kde_x11.cc - -objects/gui_kde_wid.o: gui_kde_wid.cc - $(MOC) -o gui_kde_wid_moc.cc gui_kde_wid.h - $(KDE_DIR)/bin/dcopidl kvim_iface.h > kvim_iface.kidl || ( rm -f kvim_iface.kidl ; /bin/false ) - $(KDE_DIR)/bin/dcopidl2cpp --c++-suffix cc --no-stub kvim_iface.kidl - $(CCC) -o $@ gui_kde_wid.cc - -gui_kde_wid_moc.cc: objects/gui_kde_wid.o -objects/gui_kde_wid_moc.o: gui_kde_wid_moc.cc - $(CCC) -o $@ gui_kde_wid_moc.cc - -kvim_iface_skel.cc: objects/gui_kde_wid.o -objects/kvim_iface_skel.o: kvim_iface_skel.cc - $(CCC) -o $@ kvim_iface_skel.cc - objects/netbeans.o: netbeans.c $(CCC) -o $@ netbeans.c @@ -2897,36 +2836,6 @@ objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii. keymap.h term.h macros.h structs.h regexp.h gui.h gui_beval.h \ proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \ arabic.h if_sniff.h -objects/gui_kde.o: gui_kde.cc gui_kde_wid.h kvim_iface.h vim.h auto/config.h \ - feature.h os_unix.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ - gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \ - globals.h farsi.h arabic.h if_sniff.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 \ - ../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 -objects/gui_kde_wid.o: gui_kde_wid.cc gui_kde_wid.h kvim_iface.h vim.h \ - auto/config.h feature.h os_unix.h ascii.h keymap.h term.h macros.h \ - structs.h regexp.h gui.h gui_beval.h proto/gui_beval.pro option.h \ - ex_cmds.h proto.h globals.h farsi.h arabic.h if_sniff.h version.h \ - proto/../../pixmaps/alert.xpm proto/../../pixmaps/error.xpm \ - proto/../../pixmaps/generic.xpm proto/../../pixmaps/info.xpm \ - proto/../../pixmaps/quest.xpm -objects/gui_kde_x11.o: gui_kde_x11.cc gui_kde_wid.h kvim_iface.h vim.h \ - auto/config.h feature.h os_unix.h ascii.h keymap.h term.h macros.h \ - structs.h regexp.h gui.h gui_beval.h proto/gui_beval.pro option.h \ - ex_cmds.h proto.h globals.h farsi.h arabic.h if_sniff.h version.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 structs.h regexp.h gui.h \ gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h globals.h \ diff --git a/src/auto/configure b/src/auto/configure index c109822693..794fd8f427 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 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 MOC KDE_CONFIG KDE_LIBS KDE_INCLUDES KDE_PREFIX CXX CXXFLAGS ac_ct_CXX QT_LIBS QT_INCLUDES ROOTQT 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 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_files='' # Initialize some variables set by options. @@ -770,14 +770,6 @@ ac_env_CPP_set=${CPP+set} ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS # # Report the --help message. @@ -868,8 +860,7 @@ Optional Features: --enable-hangulinput Include Hangul input support. --enable-xim Include XIM input support. --enable-fontset Include X fontset output support. - --enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/kde/motif/athena/neXtaw/photon/carbon - --enable-kde-check If auto-select GUI, check for KDE default=no + --enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon --enable-gtk-check If auto-select GUI, check for GTK default=yes --enable-gtk2-check If GTK GUI, check for GTK+ 2 default=yes --enable-gnome-check If GTK GUI, check for GNOME default=no @@ -877,9 +868,6 @@ Optional Features: --enable-athena-check If auto-select GUI, check for Athena default=yes --enable-nextaw-check If auto-select GUI, check for neXtaw default=yes --enable-carbon-check If auto-select GUI, check for Carbon default=yes - --enable-kde-toolbar if KDE GUI is selected, enable a KDE-look toolbar default=no - --disable-rpath Disable rpath. - --disable-kdetest Do not try to compile and run a test KDE program --disable-gtktest Do not try to compile and run a test GTK program --disable-acl Don't check for ACL support. --disable-gpm Don't use gpm (Linux mouse daemon). @@ -899,12 +887,6 @@ Optional Packages: --with-python-config-dir=PATH Python's config directory --with-tclsh=PATH which tclsh to use (default: tclsh8.0) --with-x use the X Window System - --with-qt-dir=DIR Specify prefix of QT files - --with-qt-includes=DIR Specify location of Qt headers - --with-qt-libs=DIR Specify location of Qt libraries - --with-kde-prefix=PFX Prefix where KDE is installed (optional) - --with-kde-includes=DIR Specify location of KDE headers - --with-kde-libs=DIR Specify location of KDE libraries --with-gtk-prefix=PFX Prefix where GTK is installed (optional) --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) --with-gnome-includes=DIR Specify location of GNOME headers @@ -921,8 +903,6 @@ Some influential environment variables: CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -4516,7 +4496,7 @@ echo $ECHO_N "checking for location of tclConfig.sh script... $ECHO_C" >&6 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/' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'` + 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'` break fi done @@ -6916,7 +6896,6 @@ 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 @@ -6972,9 +6951,6 @@ echo "${ECHO_T}yes/auto - automatic GUI support" >&6 SKIP_ATHENA= SKIP_NEXTAW= SKIP_CARBON=;; - kde|Kde|KDE) echo "$as_me:$LINENO: result: KDE 2.x or 3.x GUI support" >&5 -echo "${ECHO_T}KDE 2.x or 3.x GUI support" >&6 - SKIP_KDE=;; gtk) echo "$as_me:$LINENO: result: GTK+ 1.x GUI support" >&5 echo "${ECHO_T}GTK+ 1.x GUI support" >&6 SKIP_GTK=;; @@ -7006,23 +6982,6 @@ echo "${ECHO_T}Sorry, $enable_gui GUI is not supported" >&6 ;; fi -if test "x$SKIP_KDE" != "xYES" -a "$enable_gui_canon" != "kde"; then - echo "$as_me:$LINENO: checking whether or not to look for KDE" >&5 -echo $ECHO_N "checking whether or not to look for KDE... $ECHO_C" >&6 - # Check whether --enable-kde-check or --disable-kde-check was given. -if test "${enable_kde_check+set}" = set; then - enableval="$enable_kde_check" - -else - enable_kde_check="no" -fi; - echo "$as_me:$LINENO: result: $enable_kde_check" >&5 -echo "${ECHO_T}$enable_kde_check" >&6; - if test "x$enable_kde_check" = "xno"; then - SKIP_KDE=YES - fi -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 @@ -7146,932 +7105,6 @@ echo "${ECHO_T}$enable_carbon_check" >&6; fi -if test -z "$SKIP_KDE"; then - -# Check whether --with-qt-dir or --without-qt-dir was given. -if test "${with_qt_dir+set}" = set; then - withval="$with_qt_dir" - - ROOTQT="$withval" - MOC="$withval"/bin/moc - QT_INCLUDES="$withval"/include - QT_LIBS="$withval"/lib - -fi; - -if test "x$ROOTQT" = "x"; then - if test -z "$QTDIR"; then - # Extract the first word of "moc", so it can be a program name with args. -set dummy moc; 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_MOC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MOC in - [\\/]* | ?:[\\/]*) - ac_cv_path_MOC="$MOC" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MOC="$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 - - test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no" - ;; -esac -fi -MOC=$ac_cv_path_MOC - -if test -n "$MOC"; then - echo "$as_me:$LINENO: result: $MOC" >&5 -echo "${ECHO_T}$MOC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test "x$MOC" = "xno"; then - { { echo "$as_me:$LINENO: error: could not find Qt directory" >&5 -echo "$as_me: error: could not find Qt directory" >&2;} - { (exit 1); exit 1; }; } - else - ROOTQT=`echo $MOC | sed 's+/bin/moc++'` - fi - else - ROOTQT="$QTDIR" - fi -fi -MOC="$ROOTQT"/bin/moc -QT_INCLUDES="$ROOTQT"/include -QT_LIBS="$ROOTQT"/lib - - -# Check whether --with-qt-includes or --without-qt-includes was given. -if test "${with_qt_includes+set}" = set; then - withval="$with_qt_includes" - QT_INCLUDES="$withval" - -fi; - - -# Check whether --with-qt-libraries or --without-qt-libraries was given. -if test "${with_qt_libraries+set}" = set; then - withval="$with_qt_libraries" - QT_LIBS="$withval" - -fi; - -if test "x$QT_LIBS" = "x" ; then - QT_LIBS="$ROOTQT"/lib -fi -if test "x$QT_INCLUDES" = "x" ; then - QT_INCLUDES="$ROOTQT"/include -fi - -echo "$as_me:$LINENO: checking whether or not to use a KDE Toolbar in KVim" >&5 -echo $ECHO_N "checking whether or not to use a KDE Toolbar in KVim... $ECHO_C" >&6 -# Check whether --enable-kde-toolbar or --disable-kde-toolbar was given. -if test "${enable_kde_toolbar+set}" = set; then - enableval="$enable_kde_toolbar" - -else - enable_kde_toolbar="no" -fi; -if test "x$enable_kde_toolbar" != "xno"; then - cat >>confdefs.h <<\_ACEOF -#define FEAT_KDETOOLBAR 1 -_ACEOF - -fi -echo "$as_me:$LINENO: result: $enable_kde_toolbar" >&5 -echo "${ECHO_T}$enable_kde_toolbar" >&6; -fi - - -if test -z "$SKIP_KDE"; then - - - - -echo "$as_me:$LINENO: checking --disable-rpath argument" >&5 -echo $ECHO_N "checking --disable-rpath argument... $ECHO_C" >&6 -# Check whether --enable-rpath or --disable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" - -else - enable_rpath="yes" -fi; -if test "$enable_rpath" = "yes"; then - 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 -fi - -echo "$as_me:$LINENO: checking --with-kde-prefix argument" >&5 -echo $ECHO_N "checking --with-kde-prefix argument... $ECHO_C" >&6 - -# Check whether --with-kde-prefix or --without-kde-prefix was given. -if test "${with_kde_prefix+set}" = set; then - withval="$with_kde_prefix" - kde_config_prefix="$withval"; -echo "$as_me:$LINENO: result: $kde_config_prefix" >&5 -echo "${ECHO_T}$kde_config_prefix" >&6 -else - kde_config_prefix="";echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi; - - -# Check whether --with-kde-includes or --without-kde-includes was given. -if test "${with_kde_includes+set}" = set; then - withval="$with_kde_includes" - KDE_INCLUDES="$withval" - -fi; - - -# Check whether --with-kde-libraries or --without-kde-libraries was given. -if test "${with_kde_libraries+set}" = set; then - withval="$with_kde_libraries" - KDE_LIBS="$withval" - -fi; - -echo "$as_me:$LINENO: checking --disable-kdetest argument" >&5 -echo $ECHO_N "checking --disable-kdetest argument... $ECHO_C" >&6 -# Check whether --enable-kdetest or --disable-kdetest was given. -if test "${enable_kdetest+set}" = set; then - enableval="$enable_kdetest" - enable_kdetest=yes -fi; - -if test "x$enable_kdetest" = "xyes" ; then - echo "$as_me:$LINENO: result: kde test enabled" >&5 -echo "${ECHO_T}kde test enabled" >&6 -else - echo "$as_me:$LINENO: result: kde test disabled" >&5 -echo "${ECHO_T}kde test disabled" >&6 -fi - -if test "x$kde_config_prefix" != "x" ; then - KDE_CONFIG=$kde_config_prefix/bin/kde-config -fi - -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 "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_KDE_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $KDE_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_KDE_CONFIG="$KDE_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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_KDE_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 - - test -z "$ac_cv_path_KDE_CONFIG" && ac_cv_path_KDE_CONFIG="no" - ;; -esac -fi -KDE_CONFIG=$ac_cv_path_KDE_CONFIG - -if test -n "$KDE_CONFIG"; then - echo "$as_me:$LINENO: result: $KDE_CONFIG" >&5 -echo "${ECHO_T}$KDE_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -else - echo "$as_me:$LINENO: result: Using KDE configuration program $KDE_CONFIG" >&5 -echo "${ECHO_T}Using KDE configuration program $KDE_CONFIG" >&6 -fi - -if test "X$KDE_CONFIG" != "X" ; then - - if test "X$KDE_CONFIG" != "X"; then - min_kde_version=2.0.0 - echo "$as_me:$LINENO: checking for KDE version >= $min_kde_version" >&5 -echo $ECHO_N "checking for KDE version >= $min_kde_version... $ECHO_C" >&6 - no_kde="" - if test "$KDE_CONFIG" = "no" ; then - no_kde=yes - else - KDE_PREFIX=`$KDE_CONFIG --prefix` - if test "x$KDE_LIBS" = "x"; then - KDE_LIBS="$KDE_PREFIX/lib" - fi - if test "x$KDE_INCLUDES" = "x"; then - 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/'` - kde_minor_version=`$KDE_CONFIG --version | grep KDE | \ -sed 's/KDE:\ //' | sed 's/\([0-9]*\).\([0-9]*.*\)/\2/'` - - qt_major_version=`$KDE_CONFIG --version | grep Qt | sed -e \ -'s/Qt:\ //' | sed 's/\([0-9]*\).\([0-9]*.*\)/\1/'` - qt_minor_version=`$KDE_CONFIG --version | grep Qt | sed -e \ -'s/Qt:\ //' | sed 's/\([0-9]*\).\([0-9]*.*\)/\2/'` - - if test "x$enable-kdetest" = "xyes" ; then - ac_save_LIBS="$LIBS" - LIBS="$LIBS $KDE_LIBS" - - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling KDE ? ? how can i remove that ? :)" -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include <stdio.h> -int -main() -{ return 0; } - -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -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 ) -no_kde=yes -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_kde" = x ; then - echo "$as_me:$LINENO: result: found KDE $kde_major_version.$kde_minor_version" >&5 -echo "${ECHO_T}found KDE $kde_major_version.$kde_minor_version" >&6 - GUI_LIB_LOC="-L$KDE_LIBS -lkdeui -lkdecore -lDCOP" - GUI_INC_LOC="-I$KDE_INCLUDES" - KDEDIR="$KDE_PREFIX" - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - KDE_LIBS="" - : - fi -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - KDE_LIBS="" - : -fi - - - - - - if test "x$KDE_PREFIX" != "x"; then - echo "$as_me:$LINENO: checking for QT version $qt_major_version.x" >&5 -echo $ECHO_N "checking for QT version $qt_major_version.x... $ECHO_C" >&6 - if test "x$ROOTQT" != "x" ; then - GUI_INC_LOC="-I$QT_INCLUDES $GUI_INC_LOC" - if test $qt_major_version -lt 2; then - { { echo "$as_me:$LINENO: error: Your QT version is prior to 2.0; KDE 2.x and 3.x require at least QT 2" >&5 -echo "$as_me: error: Your QT version is prior to 2.0; KDE 2.x and 3.x require at least QT 2" >&2;} - { (exit 1); exit 1; }; } - fi - if test "`(uname) 2>/dev/null`" = "FreeBSD"; then - CFLAGS="$CFLAGS -D_THREAD_SAFE" - CXXFLAGS="$CXXFLAGS -D_THREAD_SAFE" - GUI_LIB_LOC="$GUI_LIB_LOC -pthread" - LIBS="$LIBS -pthread" - fi - - if test "x$enable_rpath" = "xyes"; then - if test $qt_major_version = 2; then - GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC \ --Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS" - else - GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC \ --Wl,--rpath -Wl,$KDE_LIBS -Wl,--rpath -Wl,$QT_LIBS" - fi - else - if test $qt_major_version = 2; then - GUI_LIB_LOC="-L$KDE_LIBS -lkfile -L$QT_LIBS -lqt $GUI_LIB_LOC" - else - GUI_LIB_LOC="-L$KDE_LIBS -lkio -L$QT_LIBS -lqt-mt $GUI_LIB_LOC" - fi - fi - - GUI_INC_LOC="`echo $GUI_INC_LOC\ | sed 's%-I/usr/include %%'`" - - echo "$as_me:$LINENO: result: found $qt_major_version.$qt_minor_version in $ROOTQT" >&5 -echo "${ECHO_T}found $qt_major_version.$qt_minor_version in $ROOTQT" >&6 - - - qt_incdir=NO - for i in $QT_INCLUDES; - do - for j in qstyle.h; - do - echo "configure: 7522: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - qt_incdir=$i - break 2 - fi - done - done - - if test "x$qt_incdir" = "xNO"; then - { { echo "$as_me:$LINENO: error: Could not find Qt headers in $QT_INCLUDES" >&5 -echo "$as_me: error: Could not find Qt headers in $QT_INCLUDES" >&2;} - { (exit 1); exit 1; }; } - fi - |