diff options
Diffstat (limited to 'src')
43 files changed, 5239 insertions, 556 deletions
diff --git a/src/INSTALL b/src/INSTALL index b1aa6a879f..0c01ef27dc 100644 --- a/src/INSTALL +++ b/src/INSTALL @@ -88,7 +88,7 @@ that "make shadow" creates won't work.] Unix: COMPILING WITH/WITHOUT GUI These configure arguments can be used to select which GUI to use: ---enable-gui= gtk, motif, athena or auto +--enable-gui= gtk, kde, motif, athena or auto --disable-gtk-check --disable-motif-check --disable-athena-check @@ -98,19 +98,19 @@ the order of GTK, Motif, then Athena). If one is found, then is uses it and does not proceed to check any of the remaining ones. Otherwise, it moves on to the next one. ---enable-{gtk,motif,athena}-check all default to "yes", such that if +--enable-{gtk,kde,motif,athena}-check all default to "yes", such that if --enable-gui is "auto" (which it is by default), GTK, Motif, and Athena will be checked for. If you want to *exclude* a certain check, then you use ---disable-{gtk,motif,athena}-check. +--disable-{gtk,kde,motif,athena}-check. For example, if --enable-gui is set to "auto", but you don't want it look for Motif, you then also specify --disable-motif-check. This results in only checking for GTK and Athena. Lastly, if you know which one you want to use, then you can just do ---enable-gui={gtk,motif,athena}. So if you wanted to only use Motif, then +--enable-gui={gtk,kde,motif,athena}. So if you wanted to only use Motif, then you'd specify --enable-gui=motif. Once you specify what you want, the ---enable-{gtk,motif,athena}-check options are ignored. +--enable-{gtk,kde,motif,athena}-check options are ignored. For compiling with the GTK+ GUI, you need a recent version of glib and gtk+. Configure checks for at least version 1.1.16, but below 2.0. An older versions @@ -124,6 +124,9 @@ do not, you may have left-over header files and/or library files from an older auto/config.log for any error messages that may give you a hint as to what's happening. +For KDE see INSTALLkde.txt. + + Unix: COMPILING WITH MULTI-BYTE When you want to compile with the multi-byte features enabled, make sure you diff --git a/src/INSTALLkde.txt b/src/INSTALLkde.txt new file mode 100644 index 0000000000..42d4a12c80 --- /dev/null +++ b/src/INSTALLkde.txt @@ -0,0 +1,101 @@ +Vim with KDE: kvim + +ON THE INTERNET +=============== + + The homepage is http://www.freehackers.org/kvim/ + The core is build around the official vim-6.x releases and patches + + KVim CVS is full and does not need extra package. Just download and compile it. + +INSTALL : +========= + We now use Vim's configure to configure, compile and install KVim. + + Don't forget, that you need to have QT and KDE headers and tools installed, otherwise it won't + work ! (these can commonly be found in kde-devel/qt-devel packages) + + Enter the 'src' directory and configure it your way (you need to add at least these flags to the configure command line : --enable-gui=kde --with-qt-dir=$QTDIR ) then make and make install as root. + We added to configure some options for KDE / QT detection, it will for example, find whether you use KDE 2.x or KDE 3.x automatically. For now, QT is _not_ autodetected. I hope to fix this soon. + From KVim 6.1, you can now use a KDE toolbar instead of Vim's Toolbar, to enable it, use the --enable-kde-toolbar configure flag. + + +=> If it fails : (yes it still can, the configure script i wrote is still experimental and probably not +perfect ;p) + or 'how to make a bug report' : + + In some cases, I can imagine it will fail, if this happens then send to marchand@kde.org : + ->auto/config.mk (important one) + ->your configure command line with your options + ->your paths : where KDE is (which version ?), where QT is (version ?), and find where your + libs are (your kdelibs, your QT libs and QT headers) + ->the output of 'kde-config --version' + ->your OS / Linux Distribution version + ->in case of a compilation error : the full error output. + ->the compiler used (gcc 2.95, 2.96, 3.1 ...) + ->any stuff you think could be usefull to me :) + + Thanks for giving KVim a try, we hope you'll enjoy it ! + + +DEVELOPMENT STATE AND KNOWN BUGS: +================================= +Most Vim GUI features are now implemented, only multibyte support is incomplete. +We are working on this and this is our primary goal after KVim 6.1 release. +We hope to get it to work before we include KVim into the core Vim which we want to +do before the end of the year 2002 if possible. + +We would be happy to hear from you if you've tried kvim. Tell us +what is missing, what you like and don't like, and what you want. + +As people have wished it for a while, Philippe developped a component for Vim. +The component is now fully usable with GVim and KVim and can be found on KDE's CVS +in the kdeextragear-1 module. + +SOURCE ACCESS: +============== +Releases and maybe snapshots are/will be found on http://freehackers.org/kvim/ +The CVS is CVSROOT=:pserver:anonymous@cvs.tuxfamily.org:/cvsroot/kvim +(with no password) +You'll find there a full vim 6.x package (with runtime files included). + +MAILING LIST: +============= +As we released KVim 6.0, we created a public mailing list, for feedback, +user help and development related discussions : "kvim-dev@freenux.org", + to subscribe send a mail to "kvim-dev-subscribe@freenux.org" with +"subscribe" as the subject and just reply to the mail you will receive. +(sorry the admin messages are in french, but the list discussions are in +english) + +THANKS : +======== +To all the guys on #kde@opn (Neil, Malte and many other) and to all the people who +tried, debugged, compiled and recompiled again KVim to bring now a much more robust KVim +and of course to all of you who send patchs and comments :) +And of course to Vim Authors :) + +CURRENT MAINTAINER: +=================== + Mickael Marchand <marchand@kde.org> + +DEVELOPERS (CVS accounts): +========== + Mickael Marchand <marchand@kde.org> (marchand) + Mark Westcott <mark@houseoffish.org> Qtopia GUI (mark) + Thomas Capricelli <orzel@kde.org> Initial KVim author (orzel) + Philippe Fremy <pfremy@chez.com> Initial KVim author (pfremy) + +AUTHORS +========= + Thomas Capricelli <orzel@kde.org> Initial KVim author + Philippe Fremy <pfremy@chez.com> Initial KVim author + +CONTRIBUTORS +============ + David Spencer Tyree <celer@scrypt.net> + Vince Negri <vince@bulbous.freeserve.co.uk> AntiAliasing support + Kailash Sethuraman (hsaliak, #netbsd@opn) NetBSD configuration/compilation fixes + Some other, see the About KVim dialog box in KVim... + + diff --git a/src/Makefile b/src/Makefile index d59f32abe3..7e4c385b01 100644 --- a/src/Makefile +++ b/src/Makefile @@ -336,6 +336,7 @@ CClink = $(CC) # use it (e.g., want a GTK-only version), then use --enable-gui=gtk. # # If the selected GUI isn't found, the GUI is disabled automatically +#CONF_OPT_GUI = --enable-gui=kde #CONF_OPT_GUI = --enable-gui=gtk #CONF_OPT_GUI = --enable-gui=gtk --disable-gtktest #CONF_OPT_GUI = --enable-gui=gtk2 @@ -1041,6 +1042,35 @@ LINKIT = @echo >/dev/null # Without a GUI install the normal way. NONE_INSTALL = install_normal +### KDE GUI interface. +KDE_DIR = $(KDE_PREFIX) +KDE_INCL = gui.h +KDE_SRC = gui.c pty.c gui_kde.cc gui_kde_x11.cc gui_kde_widget.cc gui_kde_widget_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_widget.o objects/gui_kde_widget_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) +KDE_LIBS1 = +KDE_LIBS2 = $(KDE_LIBNAME) +KDE_INSTALL = install_normal +KDE_TARGETS = installklinks installkdeicons +KDE_MAN_TARGETS = +KDE_TESTTARGET = gui + +#for KDE rename files to avoid confusion with gvim for GTK +KVIMNAME = k$(VIMNAME) +KVIMTARGET = $(KVIMNAME)$(LNKEXT) +KVIEWNAME = k$(VIEWNAME) +KVIEWTARGET = $(KVIEWNAME)$(LNKEXT) +RKVIMNAME = r$(KVIMNAME) +RKVIMTARGET = $(RKVIMNAME)$(LNKEXT) +RKVIEWNAME = r$(KVIEWNAME) +RKVIEWTARGET = $(RKVIEWNAME)$(LNKEXT) +KVIMDIFFNAME = k$(VIMDIFFNAME) +KVIMDIFFTARGET = $(KVIMDIFFNAME)$(LNKEXT) + ### GTK GUI GTK_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \ gui_beval.c @@ -1170,8 +1200,8 @@ CARBONGUI_MAN_TARGETS = CARBONGUI_TESTTARGET = # All GUI files -ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.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_athena.pro gui_gtk_x11.pro gui_x11.pro gui_w16.pro gui_w32.pro gui_amiga.pro gui_photon.pro +ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.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_widget.cc gui_kde_x11.cc gui_kde_widget_moc.cc +ALL_GUI_PRO = gui.pro gui_gtk.pro gui_motif.pro gui_athena.pro gui_gtk_x11.pro gui_x11.pro gui_w16.pro gui_w32.pro gui_amiga.pro gui_photon.pro gui_kde.pro gui_kde_x11.pro # }}} @@ -1307,7 +1337,7 @@ BASIC_SRC = \ SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) $(PERL_SRC) $(PYTHON_SRC) \ $(TCL_SRC) $(RUBY_SRC) $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) -TAGS_SRC = *.c *.cpp if_perl.xs +TAGS_SRC = *.c *.cpp *.cc if_perl.xs EXTRA_SRC = hangulin.c auto/if_perl.c if_perlsfio.c if_python.c if_tcl.c \ if_ruby.c if_sniff.c gui_beval.c \ @@ -1800,6 +1830,23 @@ install-languages: languages $(DEST_LANG) $(DEST_KMAP) fi # install the icons for KDE, if the directory exists and the icon doesn't. +# doesn't.<=looks strange to install icons to user's directory ;), i add my +# own install procedure, mikmak +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 + ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps @@ -1848,8 +1895,17 @@ installglinks: $(DEST_BIN)/$(GVIMTARGET) \ $(DEST_BIN)/$(EVIEWTARGET) \ $(INSTALLGVIMDIFF) +installklinks: $(DEST_BIN)/$(KVIMTARGET) \ + $(DEST_BIN)/$(KVIEWTARGET) \ + $(DEST_BIN)/$(RKVIMTARGET) \ + $(DEST_BIN)/$(RKVIEWTARGET) \ + $(DEST_BIN)/$(EVIMTARGET) \ + $(DEST_BIN)/$(EVIEWTARGET) \ + installkvimdiff + installvimdiff: $(DEST_BIN)/$(VIMDIFFTARGET) installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET) +installkvimdiff: $(DEST_BIN)/$(KVIMDIFFTARGET) $(DEST_BIN)/$(EXTARGET): cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET) @@ -1863,6 +1919,12 @@ $(DEST_BIN)/$(GVIMTARGET): $(DEST_BIN)/$(GVIEWTARGET): cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET) +$(DEST_BIN)/$(KVIMTARGET): + cd $(DEST_BIN); ln -s $(VIMTARGET) $(KVIMTARGET) + +$(DEST_BIN)/$(KVIEWTARGET): + cd $(DEST_BIN); ln -s $(VIMTARGET) $(KVIEWTARGET) + $(DEST_BIN)/$(RVIMTARGET): cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET) @@ -1875,12 +1937,21 @@ $(DEST_BIN)/$(RGVIMTARGET): $(DEST_BIN)/$(RGVIEWTARGET): cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET) +$(DEST_BIN)/$(RKVIMTARGET): + cd $(DEST_BIN); ln -s $(VIMTARGET) $(RKVIMTARGET) + +$(DEST_BIN)/$(RKVIEWTARGET): + cd $(DEST_BIN); ln -s $(VIMTARGET) $(RKVIEWTARGET) + $(DEST_BIN)/$(VIMDIFFTARGET): cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET) $(DEST_BIN)/$(GVIMDIFFTARGET): cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET) +$(DEST_BIN)/$(KVIMDIFFTARGET): + cd $(DEST_BIN); ln -s $(VIMTARGET) $(KVIMDIFFTARGET) + $(DEST_BIN)/$(EVIMTARGET): cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET) @@ -1895,7 +1966,7 @@ installhelplinks: $(GUI_MAN_TARGETS) \ $(DEST_MAN)/$(RVIMNAME).1 \ $(DEST_MAN)/$(RVIEWNAME).1 -installghelplinks: $(DEST_MAN)/$(GVIMNAME).1 \ +installghelplinks installkhelplinks : $(DEST_MAN)/$(GVIMNAME).1 \ $(DEST_MAN)/$(GVIEWNAME).1 \ $(DEST_MAN)/$(RGVIMNAME).1 \ $(DEST_MAN)/$(RGVIEWNAME).1 \ @@ -1939,9 +2010,12 @@ uninstall: uninstall_runtime -rm -f $(DEST_BIN)/xxd$(EXEEXT) $(DEST_MAN)/xxd.1 -rm -f $(DEST_BIN)/$(EXTARGET) $(DEST_BIN)/$(VIEWTARGET) -rm -f $(DEST_BIN)/$(GVIMTARGET) $(DEST_BIN)/$(GVIEWTARGET) + -rm -f $(DEST_BIN)/$(KVIMTARGET) $(DEST_BIN)/$(KVIEWTARGET) -rm -f $(DEST_BIN)/$(RVIMTARGET) $(DEST_BIN)/$(RVIEWTARGET) -rm -f $(DEST_BIN)/$(RGVIMTARGET) $(DEST_BIN)/$(RGVIEWTARGET) + -rm -f $(DEST_BIN)/$(RKVIMTARGET) $(DEST_BIN)/$(RKVIEWTARGET) -rm -f $(DEST_BIN)/$(VIMDIFFTARGET) $(DEST_BIN)/$(GVIMDIFFTARGET) + -rm -f $(DEST_BIN)/$(VIMDIFFTARGET) $(DEST_BIN)/$(KVIMDIFFTARGET) -rm -f $(DEST_BIN)/$(EVIMTARGET) $(DEST_BIN)/$(EVIEWTARGET) -rm -f $(DEST_MAN)/$(EXNAME).1 $(DEST_MAN)/$(VIEWNAME).1 -rm -f $(DEST_MAN)/$(GVIMNAME).1 $(DEST_MAN)/$(GVIEWNAME).1 @@ -1984,6 +2058,7 @@ clean celan: testclean -rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) xxd/*.o -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c -rm -f conftest* *~ auto/link.sed + -rm -f gui_kde_widget_moc.cc kvim_iface_skel.cc *.kidl if test -d $(PODIR); then \ cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \ fi @@ -2326,6 +2401,24 @@ 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_widget.o: gui_kde_widget.cc + $(MOC) -o gui_kde_widget_moc.cc gui_kde_widget.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_widget.cc + +objects/gui_kde_widget_moc.o: gui_kde_widget_moc.cc + $(CCC) -o $@ gui_kde_widget_moc.cc + +objects/kvim_iface_skel.o: kvim_iface_skel.cc + $(CCC) -o $@ kvim_iface_skel.cc + objects/netbeans.o: netbeans.c $(CCC) -o $@ netbeans.c @@ -2637,6 +2730,24 @@ objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ ascii.h keymap.h term.h macros.h 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 +objects/gui_kde.o: gui_kde.cc gui_kde_widget.h kvim_iface.h 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 option.h ex_cmds.h proto.h \ + globals.h farsi.h +objects/gui_kde_widget.o: gui_kde_widget.cc gui_kde_widget.h kvim_iface.h \ + 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 option.h ex_cmds.h proto.h \ + globals.h farsi.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_widget.h kvim_iface.h 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 option.h ex_cmds.h proto.h \ + globals.h farsi.h version.h ../runtime/vim32x32.xpm +objects/gui_kde_widget_moc.o: gui_kde_widget_moc.cc gui_kde_widget.h \ + kvim_iface.h 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 option.h \ + ex_cmds.h proto.h globals.h objects/hangulin.o: hangulin.c vim.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h proto/gui_beval.pro option.h ex_cmds.h proto.h \ diff --git a/src/auto/configure b/src/auto/configure index b040a75f5e..e9e5637f24 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -62,7 +62,9 @@ ac_help="$ac_help ac_help="$ac_help --with-x use the X Window System" ac_help="$ac_help - --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon/carbon]" + --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/kde/motif/athena/neXtaw/beos/photon/carbon]" +ac_help="$ac_help + --enable-kde-check If auto-select GUI, check for KDE [default=no]" ac_help="$ac_help --enable-gtk-check If auto-select GUI, check for GTK [default=yes]" ac_help="$ac_help @@ -78,6 +80,24 @@ ac_help="$ac_help ac_help="$ac_help --enable-carbon-check If auto-select GUI, check for Carbon [default=yes]" ac_help="$ac_help + --with-qt-dir=DIR Specify prefix of QT files" +ac_help="$ac_help + --with-qt-includes=DIR Specify location of Qt headers" +ac_help="$ac_help + --with-qt-libs=DIR Specify location of Qt libraries" +ac_help="$ac_help + --enable-kde-toolbar if KDE GUI is selected, enable a KDE-look toolbar [default=no]" +ac_help="$ac_help + --disable-rpath Disable rpath." +ac_help="$ac_help + --with-kde-prefix=PFX Prefix where KDE is installed (optional)" +ac_help="$ac_help + --with-kde-includes=DIR Specify location of KDE headers" +ac_help="$ac_help + --with-kde-libs=DIR Specify location of KDE libraries" +ac_help="$ac_help + --disable-kdetest Do not try to compile and run a test KDE program" +ac_help="$ac_help --with-gtk-prefix=PFX Prefix where GTK is installed (optional)" ac_help="$ac_help --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)" @@ -616,7 +636,7 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:620: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:640: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -646,7 +666,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:650: checking for $ac_word" >&5 +echo "configure:670: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -676,7 +696,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:680: checking for $ac_word" >&5 +echo "configure:700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -727,7 +747,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:731: checking for $ac_word" >&5 +echo "configure:751: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -759,7 +779,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:783: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -770,12 +790,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 774 "configure" +#line 794 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -801,12 +821,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:805: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:825: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:810: checking whether we are using GNU C" >&5 +echo "configure:830: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -815,7 +835,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -834,7 +854,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:838: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:858: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -865,7 +885,7 @@ else fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:869: checking how to run the C preprocessor" >&5 +echo "configure:889: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -880,13 +900,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 884 "configure" +#line 904 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -897,13 +917,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 901 "configure" +#line 921 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -914,13 +934,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 918 "configure" +#line 938 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -944,7 +964,7 @@ else fi echo "$ac_t""$CPP" 1>&6 cat > conftest.$ac_ext <<EOF -#line 948 "configure" +#line 968 "configure" #include "confdefs.h" EOF @@ -954,7 +974,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | fi rm -f conftest* echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:958: checking for POSIXized ISC" >&5 +echo "configure:978: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -978,7 +998,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:982: checking for $ac_word" >&5 +echo "configure:1002: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1010,7 +1030,7 @@ done # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1014: checking for $ac_word" >&5 +echo "configure:1034: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1039,12 +1059,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1043: checking for Cygwin environment" >&5 +echo "configure:1063: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1048 "configure" +#line 1068 "configure" #include "confdefs.h" int main() { @@ -1055,7 +1075,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:1059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1072,19 +1092,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1076: checking for mingw32 environment" >&5 +echo "configure:1096: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1081 "configure" +#line 1101 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:1088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1103,7 +1123,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1107: checking for executable suffix" >&5 +echo "configure:1127: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1113,7 +1133,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1160,14 +1180,14 @@ test "$GCC" = yes && CPP_MM=M; if test -f ./toolcheck; then echo "checking for buggy tools" 1>&6 -echo "configure:1164: checking for buggy tools" >&5 +echo "configure:1184: checking for buggy tools" >&5 sh ./toolcheck 1>&6 fi OS_EXTRA_SRC=""; OS_EXTRA_OBJ="" |