Date: Tue, 14 Jun 2011 19:55:33 +0000 From: zy@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r223241 - in soc2011/zy/nvi-iconv/head/usr.bin/nvi: . build catalog docs include tk Message-ID: <20110614195533.57AD41065674@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zy Date: Tue Jun 14 19:55:32 2011 New Revision: 223241 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223241 Log: Remove everything relates to the TK UI. Deleted: soc2011/zy/nvi-iconv/head/usr.bin/nvi/include/tk_extern.h soc2011/zy/nvi-iconv/head/usr.bin/nvi/tk/ Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/LAYOUT soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/Makefile.in soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/README soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/configure soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/configure.in soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/distrib soc2011/zy/nvi-iconv/head/usr.bin/nvi/catalog/Makefile soc2011/zy/nvi-iconv/head/usr.bin/nvi/docs/TODO Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/LAYOUT ============================================================================== --- soc2011/zy/nvi-iconv/head/usr.bin/nvi/LAYOUT Tue Jun 14 18:58:57 2011 (r223240) +++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/LAYOUT Tue Jun 14 19:55:32 2011 (r223241) @@ -119,10 +119,5 @@ tcl_scripts/ Scripts for Tcl included with nvi. -tk/ - Source files for nvi's Tk screen support. - - init.tcl -- Vi startup tcl script. - vi/ The vi source code. Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/Makefile.in ============================================================================== --- soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/Makefile.in Tue Jun 14 18:58:57 2011 (r223240) +++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/Makefile.in Tue Jun 14 19:55:32 2011 (r223241) @@ -24,7 +24,6 @@ rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \ rec_search.o rec_seq.o rec_utils.o REOBJS= regcomp.o regerror.o regexec.o regfree.o -TKOBJS= tk_funcs.o tk_main.o tk_read.o tk_screen.o tk_term.o tk_util.o VIOBJS= cut.o delete.o ex.o ex_abbrev.o ex_append.o ex_args.o ex_argv.o \ ex_at.o ex_bang.o ex_cd.o ex_cmd.o ex_cscope.o ex_delete.o \ ex_display.o ex_edit.o ex_equal.o ex_file.o ex_filter.o \ @@ -43,7 +42,7 @@ v_zexit.o vi.o vs_line.o vs_msg.o vs_refresh.o vs_relative.o \ vs_smap.o vs_split.o -all: nvi @tknvi@ +all: nvi NVIALL= $(CLOBJS) $(VIOBJS) @cobjs@ @LIBOBJS@ nvi nex: $(NVIALL) @@ -51,10 +50,6 @@ -rm -f nex ln $@ nex -TKALL= $(TKOBJS) $(VIOBJS) @LIBOBJS@ -tknvi: $(TKALL) - $(SHRPENV) $(CC) $(LDFLAGS) -o $@ $(TKALL) @TKLIBS@ - chmod= @vi_cv_path_chmod@ cp= @vi_cv_path_cp@ ln= @vi_cv_path_ln@ @@ -172,9 +167,8 @@ clean: -rm -f *.core *.o memcpy.c perl.c - -rm -f nex nvi tknvi core - -rm -f $(COBJS) $(CLOBJS) $(DBOBJS) $(REOBJS) - -rm -f $(TKOBJS) $(VIOBJS) + -rm -f nex nvi core + -rm -f $(COBJS) $(CLOBJS) $(DBOBJS) $(REOBJS) $(VIOBJS) cleandocs: cd $(srcdir)/docs/USD.doc/vi.ref && $(MAKE) clean @@ -201,20 +195,6 @@ cl_term.o: $(srcdir)/cl/cl_term.c $(CC) $(CFLAGS) $? -# Vi Tk sources. -tk_funcs.o: $(srcdir)/tk/tk_funcs.c - $(CC) $(CFLAGS) @XINCS@ $? -tk_main.o: $(srcdir)/tk/tk_main.c - $(CC) $(CFLAGS) @XINCS@ $? -tk_read.o: $(srcdir)/tk/tk_read.c - $(CC) $(CFLAGS) @XINCS@ $? -tk_screen.o: $(srcdir)/tk/tk_screen.c - $(CC) $(CFLAGS) @XINCS@ $? -tk_term.o: $(srcdir)/tk/tk_term.c - $(CC) $(CFLAGS) @XINCS@ $? -tk_util.o: $(srcdir)/tk/tk_util.c - $(CC) $(CFLAGS) @XINCS@ $? - # Vi Tcl/Perl interpreter sources. api.o: $(srcdir)/common/api.c $(CC) $(CFLAGS) $? Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/README ============================================================================== --- soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/README Tue Jun 14 18:58:57 2011 (r223240) +++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/README Tue Jun 14 19:55:32 2011 (r223241) @@ -6,9 +6,9 @@ configure make -and nvi will configure the system and build one or two binaries: nvi and -tknvi. You can use any path to the configure script, e.g., to build for -an x86 architecture, I suggest that you do: +and nvi will configure the system and build the binary, nvi. You can use +any path to the configure script, e. g., to build for an x86 architecture. +I suggest that you do: mkdir build.x86 cd build.x86 @@ -53,7 +53,6 @@ --enable-debug Build a debugging version. --enable-perlinterp Include a Perl interpreter in vi. --enable-tclinterp Include a Tk/Tcl interpreter in vi. - --enable-tknvi Build a Tk/Tcl front-end for vi. disable-curses: By default, nvi loads its own implementation of the curses @@ -122,16 +121,6 @@ libraries aren't in the standard library and include locations, see the next section of this README file for more information. -enable-tknvi: - If you have the Tk/Tcl libraries and you want to build the Tcl/Tk - nvi front-end, enter: - - --enable-tknvi - - as an argument to configure. If your Tk/Tcl include files and - libraries aren't in the standard library and include locations, - see the next section of this README file for more information. - =-=-=-=-=-=-= ADDING OR CHANGING COMPILERS, OR COMPILE OR LOAD LINE FLAGS =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -232,9 +221,8 @@ You do not need to specify additional libraries to load Tk/Tcl, Perl or curses, as the nvi configuration script adds the appropriate libraries to the load line whenever you specify - --enable-tknvi or other Perl or Tk/Tcl related option, or build - the Tk/Tcl or curses version of nvi. The library names that are - automatically loaded are as follows: + --enable-tclinterp and/or --enable-perlinterp. The library names + that are automatically loaded are as follows: for Perl: -lperl for Tk/Tcl: -ltk -ltcl -lm Modified: soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/configure ============================================================================== --- soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/configure Tue Jun 14 18:58:57 2011 (r223240) +++ soc2011/zy/nvi-iconv/head/usr.bin/nvi/build/configure Tue Jun 14 19:55:32 2011 (r223241) @@ -18,8 +18,6 @@ ac_help="$ac_help --enable-perlinterp Include a Perl interpreter in vi." ac_help="$ac_help - --enable-tknvi Build a Tk/Tcl front-end for vi." -ac_help="$ac_help --enable-tclinterp Include a Tk/Tcl interpreter in vi." ac_help="$ac_help --disable-curses DON'T use the nvi-provided curses routines." @@ -581,7 +579,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:585: checking for a BSD compatible install" >&5 +echo "configure:583: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -640,7 +638,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:644: checking host system type" >&5 +echo "configure:642: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -681,7 +679,7 @@ echo $ac_n "checking if --enable-debug option specified""... $ac_c" 1>&6 -echo "configure:685: checking if --enable-debug option specified" >&5 +echo "configure:683: checking if --enable-debug option specified" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -717,7 +715,7 @@ lynxos*) # 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:721: checking for $ac_word" >&5 +echo "configure:719: 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 @@ -747,7 +745,7 @@ # 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:751: checking for $ac_word" >&5 +echo "configure:749: 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 @@ -798,7 +796,7 @@ # 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:802: checking for $ac_word" >&5 +echo "configure:800: 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 @@ -830,7 +828,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:834: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:832: 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. @@ -841,12 +839,12 @@ cat > conftest.$ac_ext << EOF -#line 845 "configure" +#line 843 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:848: \"$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 @@ -872,12 +870,12 @@ { 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:876: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:874: 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:881: checking whether we are using GNU C" >&5 +echo "configure:879: 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 @@ -886,7 +884,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:890: \"$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:888: \"$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 @@ -905,7 +903,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:909: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:907: 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 @@ -937,7 +935,7 @@ fi echo $ac_n "checking for GNU C (gcc) version 2.x""... $ac_c" 1>&6 -echo "configure:941: checking for GNU C (gcc) version 2.x" >&5 +echo "configure:939: checking for GNU C (gcc) version 2.x" >&5 ac_cv_gcc_vers=`${CC-cc} -v 2>&1 | \ grep "gcc version " | sed 's/.*version //'` ac_cv_gcc_major=`echo "$ac_cv_gcc_vers" | sed 's/\..*//'` @@ -1001,7 +999,7 @@ # 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:1005: checking for $ac_word" >&5 +echo "configure:1003: 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 @@ -1031,7 +1029,7 @@ # 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:1035: checking for $ac_word" >&5 +echo "configure:1033: 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 @@ -1082,7 +1080,7 @@ # 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:1086: checking for $ac_word" >&5 +echo "configure:1084: 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 @@ -1114,7 +1112,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1118: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1116: 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. @@ -1125,12 +1123,12 @@ cat > conftest.$ac_ext << EOF -#line 1129 "configure" +#line 1127 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1132: \"$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 @@ -1156,12 +1154,12 @@ { 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:1160: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1158: 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:1165: checking whether we are using GNU C" >&5 +echo "configure:1163: 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 @@ -1170,7 +1168,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1174: \"$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:1172: \"$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 @@ -1189,7 +1187,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1193: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1191: 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 @@ -1226,7 +1224,7 @@ # Extract the first word of "sh", so it can be a program name with args. set dummy sh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1230: checking for $ac_word" >&5 +echo "configure:1228: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_shell'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1267,7 +1265,7 @@ # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1271: checking for $ac_word" >&5 +echo "configure:1269: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_sendmail'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1309,7 @@ # 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:1315: checking for $ac_word" >&5 +echo "configure:1313: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_perl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1350,7 +1348,7 @@ echo $ac_n "checking for preserve directory""... $ac_c" 1>&6 -echo "configure:1354: checking for preserve directory" >&5 +echo "configure:1352: checking for preserve directory" >&5 if eval "test \"`echo '$''{'vi_cv_path_preserve'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1382,7 +1380,7 @@ # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1386: checking for $ac_word" >&5 +echo "configure:1384: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_chmod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1418,7 +1416,7 @@ # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1422: checking for $ac_word" >&5 +echo "configure:1420: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_cp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1454,7 +1452,7 @@ # Extract the first word of "ln", so it can be a program name with args. set dummy ln; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1458: checking for $ac_word" >&5 +echo "configure:1456: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_ln'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1490,7 +1488,7 @@ # Extract the first word of "mkdir", so it can be a program name with args. set dummy mkdir; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1494: checking for $ac_word" >&5 +echo "configure:1492: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_mkdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1526,7 +1524,7 @@ # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1530: checking for $ac_word" >&5 +echo "configure:1528: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_rm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1562,7 +1560,7 @@ # 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:1566: checking for $ac_word" >&5 +echo "configure:1564: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_strip'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1597,7 +1595,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1601: checking how to run the C preprocessor" >&5 +echo "configure:1599: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1612,13 +1610,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1616 "configure" +#line 1614 "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:1622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1620: \"$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 : @@ -1629,13 +1627,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1633 "configure" +#line 1631 "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:1639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1637: \"$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 : @@ -1646,13 +1644,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1650 "configure" +#line 1648 "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:1656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1654: \"$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 : @@ -1681,7 +1679,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1685: checking for X" >&5 +echo "configure:1683: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1743,12 +1741,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 1747 "configure" +#line 1745 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1750: \"$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 rm -rf conftest* @@ -1817,14 +1815,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 1821 "configure" +#line 1819 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1928,7 +1926,7 @@ echo $ac_n "checking if --enable-perlinterp option specified""... $ac_c" 1>&6 -echo "configure:1932: checking if --enable-perlinterp option specified" >&5 +echo "configure:1930: checking if --enable-perlinterp option specified" >&5 # Check whether --enable-perlinterp or --disable-perlinterp was given. if test "${enable_perlinterp+set}" = set; then enableval="$enable_perlinterp" @@ -1980,26 +1978,8 @@ fi - - -echo $ac_n "checking if --enable-tknvi option specified""... $ac_c" 1>&6 -echo "configure:1987: checking if --enable-tknvi option specified" >&5 -# Check whether --enable-tknvi or --disable-tknvi was given. -if test "${enable_tknvi+set}" = set; then - enableval="$enable_tknvi" - vi_cv_tknvi="yes" -else - vi_cv_tknvi="no" -fi - -echo "$ac_t""$vi_cv_tknvi" 1>&6 -if test "$vi_cv_tknvi" = "yes"; then - tknvi=tknvi - TKLIBS="-ltk -ltcl -lm $XLIBS $LIBS" -fi - echo $ac_n "checking if --enable-tclinterp option specified""... $ac_c" 1>&6 -echo "configure:2003: checking if --enable-tclinterp option specified" >&5 +echo "configure:1983: checking if --enable-tclinterp option specified" >&5 # Check whether --enable-tclinterp or --disable-tclinterp was given. if test "${enable_tclinterp+set}" = set; then enableval="$enable_tclinterp" @@ -2018,9 +1998,9 @@ fi -if test "$vi_cv_tknvi" = "yes" || test "$vi_cv_tclinterp" = "yes"; then +if test "$vi_cv_tclinterp" = "yes"; then echo $ac_n "checking for main in -ltcl""... $ac_c" 1>&6 -echo "configure:2024: checking for main in -ltcl" >&5 +echo "configure:2004: checking for main in -ltcl" >&5 ac_lib_var=`echo tcl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2028,14 +2008,14 @@ ac_save_LIBS="$LIBS" LIBS="-ltcl -ltk -lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 2032 "configure" +#line 2012 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2068,7 +2048,7 @@ fi echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6 -echo "configure:2072: checking for tgetent in -ltermlib" >&5 +echo "configure:2052: checking for tgetent in -ltermlib" >&5 ac_lib_var=`echo termlib'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2076,7 +2056,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 2080 "configure" +#line 2060 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2087,7 +2067,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:2091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2110,7 +2090,7 @@ if test "$vi_cv_termlib" = no; then echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:2114: checking for tgetent in -ltermcap" >&5 +echo "configure:2094: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2118,7 +2098,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 2122 "configure" +#line 2102 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2129,7 +2109,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:2133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2156,7 +2136,7 @@ fi echo $ac_n "checking if --disable-curses option specified""... $ac_c" 1>&6 -echo "configure:2160: checking if --disable-curses option specified" >&5 +echo "configure:2140: checking if --disable-curses option specified" >&5 # Check whether --enable-curses or --disable-curses was given. if test "${enable_curses+set}" = set; then enableval="$enable_curses" @@ -2175,17 +2155,17 @@ esac echo $ac_n "checking for sys/mman.h""... $ac_c" 1>&6 -echo "configure:2179: checking for sys/mman.h" >&5 +echo "configure:2159: checking for sys/mman.h" >&5 if eval "test \"`echo '$''{'vi_cv_include_sys_mman'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2184 "configure" +#line 2164 "configure" #include "confdefs.h" #include <sys/mman.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2169: \"$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 rm -rf conftest* @@ -2209,17 +2189,17 @@ echo "$ac_t""$vi_cv_include_sys_mman" 1>&6 echo $ac_n "checking for sys/select.h""... $ac_c" 1>&6 -echo "configure:2213: checking for sys/select.h" >&5 +echo "configure:2193: checking for sys/select.h" >&5 if eval "test \"`echo '$''{'vi_cv_include_sys_select'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2218 "configure" +#line 2198 "configure" #include "confdefs.h" #include <sys/select.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2203: \"$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 rm -rf conftest* @@ -2243,17 +2223,17 @@ echo "$ac_t""$vi_cv_include_sys_select" 1>&6 echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:2247: checking for term.h" >&5 +echo "configure:2227: checking for term.h" >&5 if eval "test \"`echo '$''{'vi_cv_include_term'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2252 "configure" +#line 2232 "configure" #include "confdefs.h" #include <term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2237: \"$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 rm -rf conftest* @@ -2277,12 +2257,12 @@ echo "$ac_t""$vi_cv_include_term" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2281: checking for ANSI C header files" >&5 +echo "configure:2261: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2286 "configure" +#line 2266 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2290,7 +2270,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2274: \"$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 rm -rf conftest* @@ -2307,7 +2287,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2311 "configure" +#line 2291 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2325,7 +2305,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2329 "configure" +#line 2309 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2346,7 +2326,7 @@ : else cat > conftest.$ac_ext <<EOF -#line 2350 "configure" +#line 2330 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2357,7 +2337,7 @@ exit (0); } EOF -if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2381,12 +2361,12 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:2385: checking for ssize_t" >&5 +echo "configure:2365: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2390 "configure" +#line 2370 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2414,14 +2394,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2418: checking whether byte ordering is bigendian" >&5 +echo "configure:2398: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 2425 "configure" +#line 2405 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2432,11 +2412,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:2436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 2440 "configure" +#line 2420 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2447,7 +2427,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:2451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2467,7 +2447,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2471 "configure" +#line 2451 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -2480,7 +2460,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2504,12 +2484,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2508: checking for working const" >&5 +echo "configure:2488: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2513 "configure" +#line 2493 "configure" #include "confdefs.h" int main() { @@ -2558,7 +2538,7 @@ ; return 0; } EOF -if { (eval echo configure:2562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2579,12 +2559,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:2583: checking for st_blksize in struct stat" >&5 +echo "configure:2563: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2588 "configure" +#line 2568 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -2592,7 +2572,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:2596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -2613,12 +2593,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2617: checking for mode_t" >&5 +echo "configure:2597: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2622 "configure" +#line 2602 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2646,12 +2626,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2650: checking for off_t" >&5 +echo "configure:2630: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2655 "configure" +#line 2635 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2679,12 +2659,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2683: checking for pid_t" >&5 +echo "configure:2663: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2688 "configure" +#line 2668 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2712,12 +2692,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2716: checking for size_t" >&5 +echo "configure:2696: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2721 "configure" +#line 2701 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2745,12 +2725,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2749: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2729: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2754 "configure" +#line 2734 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -2758,7 +2738,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2782,12 +2762,12 @@ for ac_func in bsearch gethostname getopt memchr memcpy memmove memset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2786: checking for $ac_func" >&5 +echo "configure:2766: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2791 "configure" +#line 2771 "configure" *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110614195533.57AD41065674>