diff --git a/CHANGES b/CHANGES index 29a07f7..b7a1c1a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,52 @@ +New in release 1.4.0 (stable) +============================= + +* Minor fixes + + +New in release 1.4.0rc2 +======================= + +* Ubuntu bug #252604 fixed +* set scroll fixed +* adding ASCII_DEL 0x7f for backspace + + +New in release 1.4.0rc +====================== + +* b B w W commands behave equally now (SF bug #5) +* .bvirc empty line bug fixed (SF bug #6) +* g-command bug fixed (SF bug #7) +* several minor fixes + + +New in release 1.4.0beta +======================== + +* ~ - bug fixed (by elo3456) +* debian bug #469704 fixed (bmore) +* debian bug #715687 fixed (bmore) +* red hat bug #925119 fixed + + +New in release 1.4.0alpha +========================== + +* highlight search result (by David Kelley) +* Large File Support added (by Joe Hinteregger) +* binary representation of byte in status line +* command line options renamed for compability with hexdump +* Offset handling fixed (Bug item #3036881) +* noshowmode: fix length of statusline +* bmore: 'b' bug fixed (by Tatsuyoshi) +* ';' bug fixed (by Nathan Hougthon and Christian Weisgerber) +* ZZ write bug fixed (by Joe Hinteregger) +* Buffer overflow if terminal > 255 columns (by Richard Yao) +* configure fixed (by Richard Yao) +* ncurses with tinfo fixed (by Richard Yao) + + New in release 1.3.2 ==================== diff --git a/CREDITS b/CREDITS index 306802c..1a90751 100644 --- a/CREDITS +++ b/CREDITS @@ -10,6 +10,19 @@ Nico Schmidt r-bug fix Steve Waltner Mac OS X support Andre Wobst AIX fixes SimoN bmore: subshell support fixes, DJGPP support +Alastair Thomas Parker binary representation in status +Tatsuyoshi bmore: 'b' bug fix +Nathan Hougthon ';' - bug +Christian "naddy" Weisgerber ';' - bug +David Kelley Highlight patch, backspace patch +Markus Ewert Apple backspace +Michael Tautschnig Conflicting declaration of 'precoint' fixed +Sebastian Kayser <> Offset handling fixed (Bug item #3036881) +Josef Hinteregger ZZ write bug, lfs +Richard Yao Buffer overflow at terminals > 255, ncurses with tinfo, configure fixed + ~ operator dumps core +Dave Keaton ASCII_DEL patch + Packages: Christian "naddy" Weisgerber Source RPM @@ -17,7 +30,9 @@ Christian Kurz Debian package Stijn de Bekker Debian package Troy Engel i386 RPM package Thomas Steudten RH alpha and x86 RPM package +John M. Huddleston Cygwin binaries +Sam Hocevar Debian Packages Doc: -Sven Guckes +Sven Guckes Ben diff --git a/Makefile.in b/Makefile.in index 55e9b25..a8b1679 100644 --- a/Makefile.in +++ b/Makefile.in @@ -6,7 +6,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# Copyright (c) 1996-2003 by Gerhard Buergmann +# Copyright (c) 1996-2014 by Gerhard Buergmann # gerhard@puon.at # # 1996-01-18 V 1.0.0 @@ -16,28 +16,31 @@ # 2000-05-31 V 1.3.0 beta # 2000-10-01 V 1.3.0 final # 2003-07-03 V 1.3.2 +# 2014-10-01 V 1.4.0 # ############################################### srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ -bindir = $(DESTDIR)@bindir@ -mandir = $(DESTDIR)@mandir@ -libdir = $(DESTDIR)@libdir@ +bindir = $(DESTDIR)@bindir@ +mandir = $(DESTDIR)@mandir@ +libdir = $(DESTDIR)@libdir@ +helpdir = $(DESTDIR)@datadir@/bvi man1dir = $(mandir)/man1 -OBJS = bvi.o comm.o set.o re.o io.o edit.o recomp.o -HEADER = bvi.h set.h -BMOBJ = bmore.o bm_unix.o recomp.o -CC = @CC@ -CFLAGS = @CFLAGS@ @CPPFLAGS@ -DEFS = @DEFS@ -LDFLAGS= @LDFLAGS@ -LIBS = @LIBS@ -SHELL = /bin/sh +OBJS = bvi.o comm.o set.o re.o io.o edit.o recomp.o +INCLUDES = bvi.h set.h +BMOBJ = bmore.o bm_unix.o recomp.o +CC = @CC@ +CFLAGS = @CFLAGS@ @CPPFLAGS@ +DEFS = @DEFS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +SHELL = /bin/sh @@ -48,32 +51,32 @@ INSTALL_DATA = @INSTALL_DATA@ all: bvi bmore -bvi: $(OBJS) +bvi: $(OBJS) $(HEADER) $(CC) $(LDFLAGS) -o bvi $(OBJS) $(LIBS) bmore: $(BMOBJ) $(CC) $(LDFLAGS) -o bmore $(BMOBJ) $(LIBS) -.c.o: +%.o: %.c $(INCLUDES) $(CC) $(CFLAGS) $(DEFS) -c $< bmore.o: bmore.c - $(CC) $(CFLAGS) $(DEFS) -DHELPFILE=\"$(libdir)/bmore.help\" -c $< + $(CC) $(CFLAGS) $(DEFS) -DHELPFILE=\"$(helpdir)/bmore.help\" -c $< install: all installdirs @echo "Installing bvi" @$(INSTALL_DATA) bvi.1 bmore.1 $(man1dir) - @$(INSTALL_PROGRAM) -s bvi $(bindir) - @$(INSTALL_PROGRAM) -s bmore $(bindir) - @$(INSTALL_DATA) bmore.help $(libdir) + @$(INSTALL_PROGRAM) bvi $(bindir) + @$(INSTALL_PROGRAM) bmore $(bindir) + @$(INSTALL_DATA) bmore.help $(helpdir) @if [ -f $(bindir)/bview ]; then rm $(bindir)/bview; fi @if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi @ln $(bindir)/bvi $(bindir)/bview @ln $(bindir)/bvi $(bindir)/bvedit installdirs: - $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(libdir) $(man1dir) + $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(helpdir) $(man1dir) uninstall: @echo "Uninstalling bvi" @@ -81,7 +84,7 @@ uninstall: @if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi @if [ -f $(bindir)/bvi ]; then rm $(bindir)/bvi; fi @if [ -f $(bindir)/bmore ]; then rm $(bindir)/bmore; fi - @if [ -f $(libdir)/bmore.help ]; then rm $(libdir)/bmore.help; fi + @if [ -f $(helpdir)/bmore.help ]; then rm $(helpdir)/bmore.help; fi @if [ -f $(man1dir)/bvi.1 ]; then rm $(man1dir)/bvi.1; fi @if [ -f $(man1dir)/bmore.1 ]; then rm $(man1dir)/bmore.1; fi diff --git a/README b/README index b80a99b..982dc52 100644 --- a/README +++ b/README @@ -9,8 +9,8 @@ and is distributed under the GPL (GNU Public License). How to compile ============== - gunzip -c bvi-1.3.2.tar.gz | tar xvf - - cd bvi-1.3.2 + gunzip -c bvi-1.4.0.src.tar.gz | tar xvf - + cd bvi-1.4.0 ./configure make make install diff --git a/bc/bmore/BMORE.PRJ b/bc/bmore/BMORE.PRJ deleted file mode 100644 index 3abd944..0000000 Binary files a/bc/bmore/BMORE.PRJ and /dev/null differ diff --git a/bc/bmore/BMORE.TCP b/bc/bmore/BMORE.TCP deleted file mode 100644 index 90da583..0000000 Binary files a/bc/bmore/BMORE.TCP and /dev/null differ diff --git a/bc/bmore/TCCONFIG.TC b/bc/bmore/TCCONFIG.TC deleted file mode 100644 index f301270..0000000 Binary files a/bc/bmore/TCCONFIG.TC and /dev/null differ diff --git a/bc/bmore/TCDEF.DSK b/bc/bmore/TCDEF.DSK deleted file mode 100644 index 9f56a3d..0000000 Binary files a/bc/bmore/TCDEF.DSK and /dev/null differ diff --git a/bc/bvi/BVI.DSK b/bc/bvi/BVI.DSK deleted file mode 100644 index 3815c22..0000000 Binary files a/bc/bvi/BVI.DSK and /dev/null differ diff --git a/bc/bvi/BVI.PRJ b/bc/bvi/BVI.PRJ deleted file mode 100644 index 8f37e19..0000000 Binary files a/bc/bvi/BVI.PRJ and /dev/null differ diff --git a/bc/bvi/TCCONFIG.TC b/bc/bvi/TCCONFIG.TC deleted file mode 100644 index 2a88a61..0000000 Binary files a/bc/bvi/TCCONFIG.TC and /dev/null differ diff --git a/bc/bvi/TCPICK.TCP b/bc/bvi/TCPICK.TCP deleted file mode 100644 index 4a1dd36..0000000 Binary files a/bc/bvi/TCPICK.TCP and /dev/null differ diff --git a/bm_dos.c b/bm_dos.c old mode 100755 new mode 100644 diff --git a/bm_unix.c b/bm_unix.c index 7da803c..2c4df3b 100644 --- a/bm_unix.c +++ b/bm_unix.c @@ -4,10 +4,12 @@ * 2000-10-12 V 1.3.0 final * 2002-02-10 V 1.3.1 * 2003-07-04 V 1.3.2 + * 2010-06-02 V 1.3.4 + * 2013-08-22 V 1.4.0 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2003 by Gerhard Buergmann + * Copyright 1996-2013 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -156,6 +158,7 @@ void doshell(cmd) char *cmd; { + int ret; #ifndef DJGPP char *getenv(); char *shell; @@ -178,11 +181,11 @@ doshell(cmd) #endif reset_tty(); - system(cmd); + ret = system(cmd); set_tty(); printf("\r"); home(); - fseek(curr_file, screen_home, SEEK_SET); + fseeko(curr_file, screen_home, SEEK_SET); bytepos = screen_home; } diff --git a/bmore.c b/bmore.c index d7c9485..9b005cd 100644 --- a/bmore.c +++ b/bmore.c @@ -6,10 +6,11 @@ * 2000-10-18 V 1.3.0 final * 2002-01-16 V 1.3.1 * 2004-01-09 V 1.3.2 + * 2013-08-23 V 1.4.0 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1990-2004 by Gerhard Buergmann + * Copyright 1990-2013 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -47,7 +48,7 @@ #include "bmore.h" -char *copyright = "Copyright (C) 1990-2004 by Gerhard Buergmann"; +char *copyright = "Copyright (C) 1990-2013 by Gerhard Buergmann"; int maxx, maxy; int mymaxx = 0, mymaxy = 0; @@ -68,6 +69,7 @@ char numarr[64]; /* string for collecting number */ char addr_form[15]; int ascii_flag = 0; +int dup_print_flag = 0; int c_flag = 0, d_flag = 0; int exval = 0; int init_search = 0; @@ -87,7 +89,8 @@ static int cnt = 0; static int icnt = 0; static int smode; -char search_pat[BUFFER]; /* / or ? command */ +/* char search_pat[BUFFER]; */ /* / or ? command */ +char bmore_search_pat[BUFFER]; /* / or ? command */ char *emptyclass = "Empty byte class '[]' or '[^]'"; @@ -182,11 +185,7 @@ main(argc, argv) init_search = argv[n][1]; strcpy(sstring, &argv[n][2]); } else { - if (argv[n][1] == '0') { - init_byte = (off_t)strtol(argv[n] + 1, NULL, 16); - } else { - init_byte = (off_t)strtol(argv[n] + 1, NULL, 10); - } + init_byte = strtoll(argv[n] + 1, NULL, 0); } n++; break; @@ -221,7 +220,7 @@ main(argc, argv) } if (exval) { } else { - fseek(curr_file, init_byte, SEEK_SET); + fseeko(curr_file, init_byte, SEEK_SET); bytepos += init_byte; } } @@ -249,7 +248,7 @@ main(argc, argv) do_next(1); open_file(name); } - fclose(curr_file); + if (curr_file) fclose(curr_file); reset_tty(); exit(exval); } @@ -263,6 +262,7 @@ main(argc, argv) /* main loop */ do { to_print = 0; + dup_print_flag = 0; if (prompt) { if (prompt == 2) { while (open_file(name)) { @@ -311,15 +311,18 @@ main(argc, argv) switch (ch) { case ' ': /* Display next k lines of text [current screen size] */ + dup_print_flag = 1; if (precount > 0) to_print = precount; else to_print = maxy; break; case 'z': /* Display next k lines of bytes [current screen size]* */ + dup_print_flag = 1; if (precount > 0) z_line = precount; to_print = z_line; break; case '\r': case '\n': /* Display next k lines of text [current screen size]* */ + dup_print_flag = 1; if (precount > 0) r_line = precount; to_print = r_line; break; @@ -394,7 +397,7 @@ main(argc, argv) } else { clearscreen(); to_print = maxy + 1; - fseek(curr_file, screen_home, SEEK_SET); + fseeko(curr_file, screen_home, SEEK_SET); bytepos = screen_home; } break; @@ -412,7 +415,7 @@ main(argc, argv) } screen_home -= (maxy + 1) * out_len; if (screen_home < 0) screen_home = 0; - fseek(curr_file, screen_home, SEEK_SET); + fseeko(curr_file, screen_home, SEEK_SET); bytepos = screen_home; to_print = maxy + 1; } @@ -434,7 +437,7 @@ main(argc, argv) PRINTF("\r\n\r\n"); } screen_home += (count + maxy) * out_len; - fseek(curr_file, screen_home, SEEK_SET); + fseeko(curr_file, screen_home, SEEK_SET); bytepos = screen_home; to_print = maxy; break; @@ -460,7 +463,7 @@ main(argc, argv) bmbeep(); } else { bytepos = last_search; - fseek(curr_file, bytepos, SEEK_SET); + fseeko(curr_file, bytepos, SEEK_SET); screen_home = bytepos; to_print = maxy; PRINTF("\r"); @@ -581,7 +584,7 @@ do_next(n) { if (numfiles) { if (n == 1 && file_nr == numfiles) { - fclose(curr_file); + if (curr_file) fclose(curr_file); reset_tty(); exit(exval); } @@ -595,7 +598,7 @@ do_next(n) free(name); name = strdup(*(files + file_nr - 1)); } else { - fclose(curr_file); + if (curr_file) fclose(curr_file); reset_tty(); exit(exval); } @@ -611,7 +614,7 @@ open_file(name) if (stat(name, &buf) > -1) { filesize = buf.st_size; } - if (curr_file != NULL) fclose(curr_file); + if (curr_file) fclose(curr_file); if (numfiles > 1) do_header = 1; if ((curr_file = fopen(name, "rb")) == NULL) { perror(name); @@ -686,7 +689,7 @@ printout(lns) buffer1[num] = c; } if (!num) return 1; - if (memcmp(buffer1, buffer2, num) || !bytepos ) { + if (memcmp(buffer1, buffer2, num) || !bytepos || !dup_print_flag) { memcpy(buffer2, buffer1, num); putline(buffer2, num); if (!no_tty) flag = TRUE; @@ -707,6 +710,7 @@ printout(lns) if (screen_home < 0) screen_home = 0; return 0; } + dup_print_flag = 1; } while(num); return 1; } @@ -885,16 +889,19 @@ bmsearch(ch) return; } if (ch == '/') { - if (ascii_comp(search_pat, sstring)) return; + /* if (ascii_comp(search_pat, sstring)) return; */ + if (ascii_comp(bmore_search_pat, sstring)) return; } if (ch == '\\') { - if (hex_comp(search_pat, sstring)) return; + /* if (hex_comp(search_pat, sstring)) return; */ + if (hex_comp(bmore_search_pat, sstring)) return; } oldpos = bytepos; last_search = screen_home; if (precount < 1) precount = 1; while (precount--) { - while ((i = bmregexec(search_pat)) == 0); + /* while ((i = bmregexec(search_pat)) == 0); */ + while ((i = bmregexec(bmore_search_pat)) == 0); if (i == 1) { screen_home = bytepos; to_print = maxy; @@ -909,7 +916,7 @@ emsg(string); */ emsg("Pattern not found"); bytepos = oldpos; - fseek(curr_file, bytepos, SEEK_SET); + fseeko(curr_file, bytepos, SEEK_SET); break; } } @@ -931,7 +938,7 @@ emsg(s) putchar('\r'); cleartoeol(); highlight(); - PRINTF(s); + PRINTF("%s", s); normal(); fflush(stdout); prompt = 0; diff --git a/bmore.c.old b/bmore.c.old deleted file mode 100644 index ad016b9..0000000 --- a/bmore.c.old +++ /dev/null @@ -1,871 +0,0 @@ -/* BMORE - binary more - * - * 1990-01-31 V 1.0.0 - * 1990-09-04 V 1.1.0 - * 2000-05-31 V 1.3.0 beta - * 2000-10-18 V 1.3.0 final - * 2002-01-16 V 1.3.1 - * 2002-02-22 V 1.3.2 line 576 - * - * NOTE: Edit this file with tabstop=4 ! - * - * Copyright 1990-2003 by Gerhard Buergmann - * gerhard@puon.at - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2, or (at your option) any - * later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * See file COPYING for information on distribution conditions. - */ - - -#include - -#ifdef HAVE_LOCALE_H -# include -#endif - -#ifdef __MSDOS__ -# define PRINTF cprintf -#else -# define PRINTF printf -#ifndef HELPFILE -# define HELPFILE "/usr/local/share/bmore.help" -#endif -#endif - -#include "bmore.h" - -char *copyright = "Copyright (C) 1990-2003 by Gerhard Buergmann"; - -int maxx, maxy; -char *name = NULL; -char sstring[MAXCMD] = ""; /* string for search */ -char estring[MAXCMD] = ""; /* string for shell escape */ -char string[MAXCMD]; -FILE *curr_file = NULL, *help_file; -int AnzAdd; -long precount = -1; /* number preceding command */ - -char **files; /* list of input files */ -int numfiles; /* number of input files */ -int file_nr = 0; /* number of current input file */ - -int arrnum = 0; -char numarr[64]; /* string for collecting number */ -char addr_form[15]; - -int ascii_flag = 0; -int d_flag = 0; -int init_search = 0; -char buffer1[MAXCMD], buffer2[MAXCMD]; -int out_len; -int corr = 0, to_print; -off_t init_byte = 0; -off_t last_search = 0; -off_t screen_home, filesize; -off_t bytepos, oldpos; -int prompt = 1; -char helppath[MAXCMD]; - -static char *progname; -static char cmdbuf[MAXCMD]; -static int cnt = 0; -static int icnt = 0; -static int smode; - -char search_pat[BUFFER]; /* / or ? command */ -char *emptyclass = "Empty byte class '[]' or '[^]'"; - - -/* -a ASCII mode - * -d beginners mode - * -i ignore case - */ -void -usage() -{ - fprintf(stderr, "Usage: %s [-adi] [+linenum | +/pattern] name1 name2 ...\n", progname); - exit(1); -} - - -int -main(argc, argv) - int argc; - char *argv[]; -{ - int ch, ch1; - int colon = 0, last_ch = 0; - long last_pre = 0; - int lflag, repeat; - long count; - int i, n = 1; - int d_line, r_line, z_line; - - -#ifdef __MSDOS__ - char *poi; - - strcpy(helppath, argv[0]); - poi = strrchr(helppath, '\\'); - *poi = '\0'; - strcat(helppath, "\\MORE.HLP"); -#else - strncpy(helppath, HELPFILE, MAXCMD - 1); -#endif - -#ifdef HAVE_LOCALE_H - setlocale(LC_ALL, ""); -#endif - - progname = argv[0]; - - while (n < argc) { - switch (argv[n][0]) { - case '-': - i = 1; - while (argv[n][i] != '\0') { - switch (argv[n][i]) { - case 'a': ascii_flag++; - break; - case 'd': d_flag++; - break; - case 'i': ignore_case++; - break; - default: usage(); - } - i++; - } - n++; - break; - case '+': /* +cmd */ - if (argv[n][1] == '/' || argv[n][1] == '\\') { - init_search = argv[n][1]; - strcpy(sstring, &argv[n][2]); - } else { - if (argv[n][1] == '0') { - init_byte = (off_t)strtol(argv[n] + 1, NULL, 16); - } else { - init_byte = (off_t)strtol(argv[n] + 1, NULL, 10); - } - } - n++; - break; - default: /* must be a file name */ - name = strdup(argv[n]); - files = &(argv[n]); - numfiles = argc - n; - n = argc; - break; - } - } - if (numfiles == 0) { - curr_file = stdin; - if (isatty(fileno(stdin)) != 0) usage(); - } else { - open_file(name); - file_nr = 1; - fseek(curr_file, init_byte, SEEK_SET); - bytepos += init_byte; - } - screen_home = bytepos; - - initterm(); - set_tty(); - maxy -= 2; - z_line = maxy; - d_line = maxy / 2; - r_line = 1; - - AnzAdd = 10; - strcpy(addr_form, "%08lX "); - - if (ascii_flag) - out_len = ((maxx - AnzAdd - 1) / 4) * 4; - else - out_len = ((maxx - AnzAdd - 1) / 16) * 4; - - if (init_search) - bmsearch(init_search); - - if (no_tty) { - while(!printout(1)); - fclose(curr_file); - reset_tty(); - exit(0); - } - if (printout(maxy)) { - do_next(1); - } - /* main loop */ - do { - to_print = 0; - if (prompt) { - highvideo(); - PRINTF("--More--"); - if (prompt == 2) { - PRINTF("(Next file: %s)", name); - } else if (!no_intty && filesize) { - PRINTF("(%d%%)", (int)((bytepos * 100) / filesize)); - } - - if (d_flag) PRINTF("[Press space to continue, 'q' to quit]"); - normvideo(); - fflush(stdout); - } - ch = vgetc(); - if (prompt == 2) { - open_file(name); - } - prompt = 1; - PRINTF("\r"); - while (ch >= '0' && ch <= '9') { - numarr[arrnum++] = ch; - ch = vgetc(); - } - numarr[arrnum] = '\0'; - if (arrnum != 0) precount = strtol(numarr, (char **)NULL, 10); - else precount = -1; - lflag = arrnum = 0; - - if (ch == '.') { - precount = last_pre; - ch = last_ch; - repeat = 1; - } else { - last_pre = precount; - last_ch = ch; - if (ch == ':') colon = vgetc(); - repeat = 0; - } - - switch (ch) { - case ' ': /* Display next k lines of text [current screen size] */ - if (precount > 0) to_print = precount; - else to_print = maxy; - break; - case 'z': /* Display next k lines of bytes [current screen size]* */ - if (precount > 0) z_line = precount; - to_print = z_line; - break; - case '\r': - case '\n': /* Display next k lines of text [current screen size]* */ - if (precount > 0) r_line = precount; - to_print = r_line; - break; - case 'q': - case 'Q': - clreol(); - fclose(curr_file); - reset_tty(); - exit(0); - case ':' : - switch (colon) { - case 'f': - prompt = 0; - if (!no_intty) - PRINTF("\"%s\" line %lu", name, - (unsigned long)(bytepos - out_len)); - else - PRINTF("[Not a file] line %lu", - (unsigned long)(bytepos - out_len)); - fflush(stdout); - break; - case 'n': - if (precount < 1) precount = 1; - do_next(precount); - PRINTF("\r"); - clreol(); - PRINTF("\n...Skipping to file %s\r\n\r\n", name); - prompt = 2; - break; - case 'p': - if (precount < 1) precount = 1; - do_next(-precount); - PRINTF("\r"); - clreol(); - PRINTF("\n...Skipping back to file %s\r\n\r\n", name); - prompt = 2; - break; - case 'q': - clreol(); - fclose(curr_file); - reset_tty(); - exit(0); - break; - case '!': - if (!no_intty) { - clreol(); - if (rdline(colon, estring)) break; - doshell(estring); - PRINTF("------------------------\r\n"); - break; - } - default: - bmbeep(); - } - break; - case '!': - if (!no_intty) { - clreol(); - if (rdline(ch, estring)) break; - doshell(estring); - PRINTF("------------------------\r\n"); - break; - } - case 'd': /* Scroll k lines [current scroll size, initially 11]* */ - case BVICTRL('D'): - if (precount > 0) d_line = precount; - to_print = d_line; - break; - case BVICTRL('L'): /*** REDRAW SCREEN ***/ - if (no_intty) { - bmbeep(); - } else { - clrscr(); - to_print = maxy + 1; - fseek(curr_file, screen_home, SEEK_SET); - bytepos = screen_home; - } - break; - case 'b': /* Skip backwards k screenfuls of text [1] */ - case BVICTRL('B'): - if (no_intty) { - bmbeep(); - } else { - if (precount < 1) precount = 1; - PRINTF("...back %ld page", precount); - if (precount > 1) { - PRINTF("s\r\n"); - } else { - PRINTF("\r\n"); - } - screen_home -= (maxy + 1) * out_len; - if (screen_home < 0) screen_home = 0; - fseek(curr_file, screen_home, SEEK_SET); - bytepos = screen_home; - to_print = maxy + 1; - } - break; - case 'f': /* Skip forward k screenfuls of bytes [1] */ - case 's': /* Skip forward k lines of bytes [1] */ - if (precount < 1) precount = 1; - if (ch == 'f') { - count = maxy * precount; - } else { - count = precount; - } - putchar('\r'); - clreol(); - PRINTF("\n...skipping %ld line", count); - if (count > 1) { - PRINTF("s\r\n\r\n"); - } else { - PRINTF("\r\n\r\n"); - } - screen_home += (count + maxy) * out_len; - fseek(curr_file, screen_home, SEEK_SET); - bytepos = screen_home; - to_print = maxy; - break; - case '\\': - if (ascii_flag) { - bmbeep(); - break; - } - case '/': /**** Search String ****/ - if (!repeat) { - clreol(); - if (rdline(ch, sstring)) break; - } - case 'n': /**** Search Next ****/ - case 'N': - bmsearch(ch); - /* - to_print--; - */ - break; - case '\'': - if (no_intty) { - bmbeep(); - } else { - bytepos = last_search; - fseek(curr_file, bytepos, SEEK_SET); - screen_home = bytepos; - to_print = maxy; - PRINTF("\r"); - clreol(); - PRINTF("\n\r\n***Back***\r\n\r\n"); - } - break; - case '=': - prompt = 0; - clreol(); - PRINTF("%lX hex %lu dec", (unsigned long)bytepos, - (unsigned long)bytepos); - fflush(stdout); - break; - case '?': - case 'h': - if ((help_file = fopen(helppath, "r")) == NULL) { - emsg("Can't open help file"); - break; - } - while ((ch1 = getc(help_file)) != EOF) - putchar(ch1); - fclose(help_file); - to_print = 0; - break; - case 'w': - case 'v': - if (!no_intty) { - clreol(); - if (ch == 'v') { - sprintf(string, "bvi +%lu %s", - (unsigned long)(screen_home + - (maxy + 1) / 2 * out_len), name); - } else { - if (precount < 1) precount = bytepos - screen_home; - sprintf(string, "bvi -b %lu -s %lu %s", - (unsigned long)screen_home, - (unsigned long)precount, name); - } - doshell(string); - to_print = maxy + 1; - break; - } - default : - if (d_flag) { - emsg("[Press 'h' for instructions.]"); - } else { - bmbeep(); - } - break; - } - if (to_print) { - if (printout(to_print)) { - do_next(1); - } - } - } while (1); -} - - -int -rdline(ch, sstring) - int ch; - char *sstring; -{ - int i = 0; - int ch1 = 0; - char bstring[MAXCMD]; - - if (ch == '!') { - strcpy(bstring, sstring); - sstring[0] = '\0'; - } - putchar(ch); - fflush(stdout); - - while (i < MAXCMD) { - ch1 = vgetc(); - if (ch1 == '\n' || ch1 == '\r' || ch1 == ESC) { - break; - } else if (ch1 == 8) { - if (i) { - sstring[--i] = '\0'; - PRINTF("\r%c%s", ch, sstring); - clreol(); - } else { - ch1 = ESC; - break; - } - } else if (ch1 == '!' && i == 0) { - if (bstring[0] == '\0') { - emsg("No previous command"); - return 1; - } - putchar(ch1); - PRINTF("\r%c%s", ch, bstring); - strcat(sstring, bstring); - i = strlen(sstring); - } else { - putchar(ch1); - sstring[i++] = ch1; - } - fflush(stdout); - } - if (ch1 == ESC) { - putchar('\r'); - clreol(); - return 1; - } - if (i) sstring[i] = '\0'; - return 0; -} - - -void -do_next(n) - int n; -{ - if (numfiles) { - if (n == 1 && file_nr == numfiles) { - fclose(curr_file); - reset_tty(); - exit(0); - } - if ((file_nr + n) > numfiles) - file_nr = numfiles; - else if ((file_nr + n) < 1) - file_nr = 1; - else - file_nr += n; - prompt = 2; - free(name); - name = strdup(*(files + file_nr - 1)); - } else { - fclose(curr_file); - reset_tty(); - exit(0); - } -} - - -void -open_file(name) - char *name; -{ - struct stat buf; - - if (stat(name, &buf) > -1) { - filesize = buf.st_size; - } - if (numfiles > 1) { - PRINTF("\r"); - clreol(); - PRINTF("\n::::::::::::::\r\n%s\r\n::::::::::::::\r\n", name); - corr = 2; - } - if (curr_file != NULL) fclose(curr_file); - if ((curr_file = fopen(name, "rb")) == NULL) { - /* reset_tty(); */ - perror(name); - exit(1); - } - bytepos = screen_home = 0; -} - - -void -putline(buf, num) - char *buf; - int num; -{ - int print_pos; - unsigned char ch; - - PRINTF(addr_form, (unsigned long)bytepos); - for (print_pos = 0; print_pos < num; print_pos++) { - ch = buf[print_pos]; - if (!ascii_flag) { - PRINTF("%02X ", ch); - } - ++bytepos; - if ((ch > 31) && (ch < 127)) - *(string + print_pos) = ch; - else - *(string + print_pos) = '.'; - } - for (; print_pos < out_len; print_pos++) { - if (!ascii_flag) { - PRINTF(" "); - } - ++bytepos; - *(string + print_pos) = ' '; - } - *(string + num) = '\0'; - PRINTF("%s\r\n", string); -} - - -int -printout(lns) - int lns; -{ - int c, num; - int doub = 0; - static int flag; - - if (corr && (lns > maxy - 2)) lns -= corr; - corr = 0; - do { - for (num = 0; num < out_len; num++) { - if ((c = nextchar()) == -1) break; - buffer1[num] = c; - } - if (!num) return 1; - if (memcmp(buffer1, buffer2, num) || !bytepos ) { - memcpy(buffer2, buffer1, num); - putline(buffer2, num); - if (!no_tty) flag = TRUE; - lns--; - } else { - if (flag) { - clreol(); - PRINTF("*\r\n"); - lns--; - } else { - doub++; - } - flag = FALSE; - bytepos += num; - } - if (lns == 0) { - screen_home = bytepos - ((maxy + 1 + doub) * out_len); - if (screen_home < 0) screen_home = 0; - return 0; - } - } while(num); - return 1; -} - - -int -nextchar() -{ - if (cnt == 0) return fgetc(curr_file); - cnt--; - return cmdbuf[icnt++] & 0xff; -} - - -void -pushback(n, where) - int n; - char *where; -{ - if (cnt) memmove(cmdbuf + n, cmdbuf, n); - memcpy(cmdbuf, where, n); - icnt = 0; - cnt += n; -} - - - - -/* Return: - * -1 EOF - * 0 not found at current position - * 1 found - */ -int -bmregexec(scan) - char *scan; -{ - char *act; - int count, test; - int l; - char act_pat[MAXCMD]; /* found pattern */ - - act = act_pat; - l = 0; - while (*scan != 0) { - if ((test = nextchar()) == -1) return -1; - *act++ = test; - if (++l == MAXCMD) { - pushback(l, act_pat); - return 0; - } - if (ignore_case && smode == ASCII) test = toupper(test); - switch (*scan++) { - case ONE: /* exactly one character */ - count = *scan++; - if (count == 1) { - if (test != *scan) { - bytepos++; - if (l > 1) pushback(--l, act_pat + 1); - return 0; - } - scan++; - } else if (count > 1) { - if (sbracket(test, scan, count)) { - bytepos++; - if (l > 1) pushback(--l, act_pat + 1); - return 0; - } - scan += count; - } - break; - case STAR: /* zero or more characters */ - count = *scan++; - if (count == 1) { /* only one character, 0 - n times */ - while (test == *scan) { - if ((test = nextchar()) == -1) return -2; - *act++ = test; - if (++l == MAXCMD) { - pushback(l, act_pat); - return 0; - } - if (ignore_case && smode == ASCII) - test = toupper(test); - } - pushback(1, --act); - l--; - scan++; - } else if (count > 1) { /* characters in bracket */ - if (*scan == '^') { - do { -/* If we found something matching the next part of the expression, we - * abandon the search for not-matching characters. */ - if (bmregexec(scan + count)) { - *act++ = test; /* May be wrong case !! */ - l++; - scan += count; - bytepos--; - break; - } - if (sbracket(test, scan, count)) { - bytepos++; - if (l > 1) pushback(--l, act_pat + 1); - return 0; - } else { - if ((test = nextchar()) == -1) return -3; - *act++ = test; - if (++l == MAXCMD) { - pushback(l, act_pat); - return 0; - } - if (ignore_case && smode == ASCII) - test = toupper(test); - } - } while(1); - } else { - while(!sbracket(test, scan, count)) { - if ((test = nextchar()) == -1) return -4; - *act++ = test; - if (++l == MAXCMD) { - pushback(l, act_pat); - return 0; - } - if (ignore_case && smode == ASCII) - test = toupper(test); - } - scan += count; - pushback(1, --act); - l--; - } - } else { /* ".*" */ - do { - if ((test = nextchar()) == -1) return -5; - *act++ = test; - if (++l == MAXCMD) { - pushback(l, act_pat); - return 0; - } - pushback(1, act - 1); - bytepos--; - } while (bmregexec(scan) == 0); - bytepos++; - act--; - l--; - } - break; - } - } - pushback(l, act_pat); - return 1; /* found */ -} - - -int -sbracket(start, scan, count) - int start; - char *scan; - int count; -{ - if (*scan++ == '^') { - if (!memchr(scan, start, --count)) return 0; - } else { - if (memchr(scan, start, --count)) return 0; - } - return 1; -} - - -void -bmsearch(ch) - int ch; -{ - int i; - - if (sstring[0] == '\0') { - emsg("No previous regular expression"); - return; - } - if (ch == '/') { - if (ascii_comp(search_pat, sstring)) return; - } - if (ch == '\\') { - if (hex_comp(search_pat, sstring)) return; - } - oldpos = bytepos; - last_search = screen_home; - if (precount < 1) precount = 1; - while (precount--) { - while ((i = bmregexec(search_pat)) == 0); - if (i == 1) { - screen_home = bytepos; - to_print = maxy; - } else { /* i == -1 -> EOF */ - if (no_intty) { - PRINTF("\r\nPattern not found\r\n"); - do_next(1); - } else { -/* -sprintf(string, "Pattern not found %d - %ul", i, (unsigned long)bytepos); -emsg(string); -*/ - emsg("Pattern not found"); - bytepos = oldpos; - fseek(curr_file, bytepos, SEEK_SET); - break; - } - } - if (precount) { - nextchar(); - bytepos++; - } - } - if (prompt) { - PRINTF("\r\n...skipping\r\n"); - } -} - - -void -emsg(s) - char *s; -{ - putchar('\r'); - clreol(); - highvideo(); - PRINTF(s); - normvideo(); - fflush(stdout); - prompt = 0; -} - - -void -bmbeep() { - putchar(7); -} diff --git a/bmore.h b/bmore.h index 18d5aab..87ca556 100644 --- a/bmore.h +++ b/bmore.h @@ -9,10 +9,11 @@ * 2000-10-04 V 1.3.0 final * 2002-01-16 V 1.3.1 * 2003-02-20 V 1.3.2 + * 2010-03-28 V 1.3.4 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2003 by Gerhard Buergmann + * Copyright 1996-2010 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -57,6 +58,8 @@ # else # if HAVE_NCURSES_TERM_H # include +# else +# include # endif # endif #endif diff --git a/bmore.man b/bmore.man deleted file mode 100644 index da13196..0000000 --- a/bmore.man +++ /dev/null @@ -1,178 +0,0 @@ -BMORE(1) BMORE(1) - - -NAME - bmore - browse through a binary file - -SYNOPSIS - bmore [ -acdi ] [ -n lines ] [ -w cols ] [ +linenumber ] [ - +/ASCII-pattern ] [ +\Hex-pattern ] [ filename ... ] - - -DESCRIPTION - more is a filter that displays the contents of a binary - file on the terminal, one screenful at a time. It nor- - mally pauses after each screenful, and prints --More-- at - the bottom of the screen. bmore provides a two-line over- - lap between screens for continuity. If bmore is reading - from a file rather than a pipe, the percentage of charac- - ters displayed so far is also shown. - - bmore scrolls up to display one more screen line in - response to a RETURN character; it displays another - screenful in response to a SPACE character. Other com- - mands are listed below. - - The screen is divided in three sections or panes: The byte - offset (extreme left), the hex pane (middle), and an ascii - pane (right) which shows as printable characters those - bytes in the hex pane. On an 80 column terminal there - will be sixteen hex values and their ASCII values on each - screen line. Note that (as one would expect) the first - byte has the offset 0 (zero). - - bmore sets the terminal to noecho mode, so that the output - can be continuous. Commands that you type do not normally - show up on your terminal, except for the / , \ and ! com- - mands. - - If the standard output is not a terminal, more acts just - like cat(1V), except that a header is printed before each - file in a series. - -OPTIONS - -a ASCII mode: no hex representation of the contents. - Non printable characters are displayed as a dot (.) - - -c Clear before displaying. Redrawing the screen - instead of scrolling. - - -d Display error messages rather than ringing the ter- - minal bell if an unrecognized command is used. - This is helpful for inexperienced users. - - -i Ignore case for searching. - - -n lines - Displays the indicated number of lines in each - screenful, rather than the default (the number of - lines in the terminal screen less two). - - -w cols - Display number of cols in each line. - - +linenumber - Start up at linenumber. - - +/ASCII-pattern - Start up at the line containing the regular expres- - sion pattern. Note: unlike editors, this construct - should not end with a `/'. If it does, then the - trailing slash is taken as a character in the - search pattern. - - -USAGE - - Commands - The commands take effect immediately; it is not necessary - to type a carriage return. Up to the time when the com- - mand character itself is given, the user may type the line - kill character to cancel the numerical argument being - formed. In addition, the user may type the erase charac- - ter to redisplay the `--More--(xx%)' message. - - In the following commands, i is a numerical argument (1 by - default). - - iSPACE Display another screenful, or i more lines if i - is specified. - - iRETURN Display another line, or i more lines, if speci- - fied. - - i^D (CTRL-D) Display (scroll down) 11 more lines. i - is given, the scroll size is set to i. - - id Same as ^D. - - iz Same as SPACE, except that i, if present, - becomes the new default number of lines per - screenful. - - is Skip i lines and then print a screenful. - - if Skip i screenfuls and then print a screenful. - - i^B (CTRL-B) Skip back i screenfuls and then print a - screenful. - - b Same as ^B (CTRL-D). - - q - Q Exit from more. - - = Display the current line number. - - v Drop into the bvi(1) editor at the current off- - set of the current file. - w Drop into the bvi(1) editor at the current off- - set of the current file. Only the portion of the - file displayed on the screen will be loaded. - - h Help. Give a description of all the more com- - mands. - - i/pattern Search for the ith occurrence of the regular - expression pattern. Display the screenful - starting at the file position that contains the - ith match for the regular expression ASCII-pat- - tern, or the end of a pipe, whichever comes - first. If bmore is displaying a file and there - is no such match, its position in the file - remains unchanged. Regular expressions can be - edited using erase and kill characters. Erasing - back past the first column cancels the search - command. - - ' Single quote. Go to the point from which the - last search started. If no search has been per- - formed in the current file, go to the beginning - of the file. - - !command Invoke a shell to execute command. The charac- - ters % and !, when used within command are - replaced with the current filename and the pre- - vious shell command, respectively. If there is - no current filename, % is not expanded. Prepend - a backslash to these characters to escape expan- - sion. - - i:n Skip to the ith next filename given in the com- - mand line, or to the last filename in the list - if i is out of range. - - i:p Skip to the ith previous filename given in the - command line, or to the first filename if i is - out of range. If given while more is positioned - within a file, go to the beginning of the file. - If more is reading from a pipe, more simply - rings the terminal bell. - - :f Display the current filename and offset number. - - :q - :Q Exit from bmore (same as q or Q ). - - . Dot. Repeat the previous command. - - - FILES - /etc/termcap terminal data base - /usr/local/share/bmore.help - help file - -SEE ALSO - bvi(1), termcap(5) - - 3 Jan 2004 diff --git a/bvi.1 b/bvi.1 index 44d3cc1..f518e41 100644 --- a/bvi.1 +++ b/bvi.1 @@ -93,7 +93,7 @@ .nr % 0 .rr F .\} -.TH BVI 1 "BVI Version 1.3.2" "3/Jan/2004" "User Commands" +.TH BVI 1 "BVI Version 1.4.0" "25/Aug/2013" "User Commands" .IX Title "BVI 1" .UC .IX Name "bvi, bview - visual display editor for binary files" @@ -194,11 +194,11 @@ bvi, bview \- visual editor for binary files .SH "VERSION" .IX Header "VERSION" -bvi-1.3.2 +bvi-1.4.0 .SH "SYNOPSIS" .IX Header "SYNOPSIS" -\fBbvi\fR\ \ \ [\fB\-R\fR]\ [\fB\-c\fR\ \fIcmd\fR]\ [\fB\-f\fR\ \fIscript\fR]\ [\fB\-b\fR\ \fIbegin\fR]\ [\fB\-e\fR\ \fIend\fR]\ [\fB\-s\fR\ \fIsize\fR]\ \fIfile\fR... -\fBbview\fR\ [\fB\-R\fR]\ [\fB\-c\fR\ \fIcmd\fR]\ [\fB\-f\fR\ \fIscript\fR]\ [\fB\-b\fR\ \fIbegin\fR]\ [\fB\-e\fR\ \fIend\fR]\ [\fB\-s\fR\ \fIsize\fR]\ \fIfile\fR... +\fBbvi\fR\ \ \ [\fB\-R\fR]\ [\fB\-c\fR\ \fIcmd\fR]\ [\fB\-f\fR\ \fIscript\fR]\ [\fB\-s\fR\ \fIskip\fR]\ [\fB\-e\fR\ \fIend\fR]\ [\fB\-n\fR\ \fIlength\fR]\ \fIfile\fR... +\fBbview\fR\ [\fB\-R\fR]\ [\fB\-c\fR\ \fIcmd\fR]\ [\fB\-f\fR\ \fIscript\fR]\ [\fB\-s\fR\ \fIskip\fR]\ [\fB\-e\fR\ \fIend\fR]\ [\fB\-n\fR\ \fIlength\fR]\ \fIfile\fR... .SH "OPTIONS" .IX Header "OPTIONS" .Ip "\fIfile\fR..." 4 @@ -212,18 +212,24 @@ the buffer. You can get to the other files with the ":next" command. \*(L"Readonly": The readonly flag is set for all the files, preventing accidental overwriting with a write command. -.Ip "\fB\-b\fR \fIbegin\fR" 4 -.IX Item "\fB\-b\fR \fIbegin\fR" +.Ip "\fB\-s\fR \fIskip\fR" 4 +.IX Item "\fB\-s\fR \fIskip\fR" causes bvi to load a file not from the start but from -offset \fIbegin\fR. +offset \fIskip\fR. +Skip offset bytes from the beginning of the input. By default, offset +is interpreted as a decimal number. With a leading 0x or 0X, offset is +interpreted as a hexadecimal number, otherwise, with a leading 0, offset +is interpreted as an octal number. Appending the character b, k, or m +to offset causes it to be interpreted as a multiple of 512, 1024, or +1048576, respectively. .Ip "\fB\-e\fR \fIend\fR" 4 .IX Item "\fB\-e\fR \fIend\fR" causes bvi to load a file not till end but till address \fIend\fR. -.Ip "\fB\-s\fR \fIsize\fR" 4 -.IX Item "\fB\-s\fR \fIsize\fR" -causes bvi not to load the complete file but only \fIsize\fR bytes. +.Ip "\fB\-n\fR \fIlength\fR" 4 +.IX Item "\fB\-n\fR \fIlength\fR" +causes bvi not to load the complete file but only \fIlength\fR bytes. .Ip "\fB\-c\fR \fIcmd\fR" 4 .IX Item "\fB\-c\fR \fIcmd\fR" diff --git a/bvi.c b/bvi.c index 7fc4b9e..f614cc7 100644 --- a/bvi.c +++ b/bvi.c @@ -9,10 +9,13 @@ * 2000-10-24 V 1.3.0 final * 2002-01-03 V 1.3.1 * 2004-01-04 V 1.3.2 + * 2006-04-04 V 1.3.3 + * 2013-08-23 V 1.4.0alpha + * 2014-10-07 V 1.4.0 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2004 by Gerhard Buergmann + * Copyright 1996-2014 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -38,13 +41,13 @@ #endif -char *copyright = "Copyright (C) 1996-2004 by Gerhard Buergmann"; +char *copyright = "Copyright (C) 1996-2014 by Gerhard Buergmann"; jmp_buf env; /* context for `longjmp' function */ int loc; int maxx, maxy, x, xx, y; -int screen, status; +int screen, status, statsize; off_t size; PTR mem = NULL; PTR curpos; @@ -53,15 +56,19 @@ PTR pagepos; PTR spos; char *name = NULL; char *shell; -char string[MAXCMD]; -char cmdstr[MAXCMD + 1] = ""; +char string[MAXCMD+1]; +char cmdstr[MAXCMD+1] = ""; FILE *Ausgabe_Datei; int edits = 0; int AnzAdd, Anzahl, Anzahl3; off_t filesize, memsize, undosize; -long precount = -1; /* number preceding command */ + + +long precount = -1; int block_flag = 0; + + off_t block_begin, block_end, block_size; @@ -70,7 +77,7 @@ int numfiles; /* number of input files */ int curfile; /* number of the current file */ int arrnum = 0; -char numarr[64]; /* string for collecting number */ +char numarr[MAXCMD+1]; /* string for collecting number */ char rep_buf[BUFFER]; PTR current; @@ -88,17 +95,19 @@ char addr_form[15]; char *nobytes = "No bytes@in the buffer"; static char progname[8]; -static char line[MAXCMD]; +static char line[MAXCMD+1]; static int mark; -static int scrolly; static int wrstat = 1; void usage() { + fprintf(stderr, "Usage: %s [-R] [-c cmd | +cmd] [-f script]\n\ - [-b begin] [-e end] [-s size] file ...\n", progname); + [-s skip] [-e end] [-n length] file ...\n\ + file offset/size: 10k, 20m, 1g, 0x1000 hex, 0200 octal\n", progname); + exit(1); } @@ -116,6 +125,8 @@ main(argc, argv) off_t inaddr; char *poi; + + #ifdef HAVE_LOCALE_H setlocale(LC_ALL, ""); #endif @@ -150,26 +161,27 @@ main(argc, argv) } else { script = ++n; } - } else if (argv[n][1] == 'b') { + + } else if (argv[n][1] == 's') { if (argv[n + 1] == NULL || argv[n + 1][0] == '-') { usage(); } else { block_begin = calc_size(argv[++n]); - block_flag |= 1; + block_flag |= BLOCK_BEGIN; } } else if (argv[n][1] == 'e') { if (argv[n + 1] == NULL || argv[n + 1][0] == '-') { usage(); } else { block_end = calc_size(argv[++n]); - block_flag |= 2; + block_flag |= BLOCK_END; } - } else if (argv[n][1] == 's') { + } else if (argv[n][1] == 'n') { if (argv[n + 1] == NULL || argv[n + 1][0] == '-') { usage(); } else { block_size = calc_size(argv[++n]); - block_flag |= 4; + block_flag |= BLOCK_LEN; } } else if (argv[n][1] == 'w') { if (argv[n][2] == '\0') { @@ -197,28 +209,39 @@ main(argc, argv) break; } } + /* TODO default block_size - end of file up to max 64 KB with warning */ switch (block_flag) { - case 2: + case BLOCK_BEGIN: + /* Acc. to SF-Error 3036881 we should use the whole rest of the file */ + /* + block_size = 1024; + block_end = block_begin + block_size - 1; + */ + break; + case BLOCK_END: block_begin = 0; - case 1|2: block_size = block_end - block_begin + 1; break; - case 4: + case BLOCK_BEGIN|BLOCK_END: + block_size = block_end - block_begin + 1; + break; + case BLOCK_LEN: block_begin = 0; - case 1|4: block_end = block_begin + block_size - 1; break; - case 2|4: + case BLOCK_BEGIN|BLOCK_LEN: + block_end = block_begin + block_size - 1; + break; + case BLOCK_END|BLOCK_LEN: block_begin = block_end + 1 - block_size; break; - case 1|2|4: + case BLOCK_BEGIN|BLOCK_END|BLOCK_LEN: if (block_end - block_begin != block_size + 1) { fprintf(stderr, "Ambigous block data\n"); exit(1); } break; } - if (block_flag && !numfiles) { fprintf(stderr, "Cannot read a range of a nonexisting file\n"); exit(1); @@ -232,8 +255,7 @@ main(argc, argv) maxy = LINES; if (params[P_LI].flags & P_CHANGED) maxy = P(P_LI); - scrolly = maxy / 2; - P(P_SS) = scrolly; + P(P_SS) = maxy / 2; P(P_LI) = maxy; maxy--; keypad(stdscr, TRUE); @@ -242,18 +264,27 @@ main(argc, argv) cbreak(); noecho(); - /* - AnzAdd = 8; - strcpy(addr_form, "%06lX "); - */ - AnzAdd = 10; - strcpy(addr_form, "%08lX "); + { + /* address column width */ + /* default is 8 + 2 blanks */ + /* if block_begin has 8 hex digits or more */ + /* reserve 1 hex digit more than required */ + char tmp[sizeof(block_begin) * 2 + 3]; + AnzAdd = sprintf(tmp, "%llX", (long long unsigned)block_begin) + 1; + if (AnzAdd < 8) + AnzAdd = 8; + if (AnzAdd > sizeof(block_begin) * 2) + AnzAdd = sizeof(block_begin) * 2; + sprintf(addr_form, "%%0%dllX ", AnzAdd); + AnzAdd = sprintf(tmp, addr_form, block_begin); + } Anzahl = ((COLS - AnzAdd - 1) / 16) * 4; P(P_CM) = Anzahl; maxx = Anzahl * 4 + AnzAdd + 1; Anzahl3 = Anzahl * 3; - status = Anzahl3 + Anzahl - 17; + statsize = 35; + status = Anzahl3 + Anzahl - statsize; screen = Anzahl * (maxy - 1); signal(SIGINT, SIG_IGN); @@ -279,11 +310,11 @@ main(argc, argv) setcur(); ch = vgetc(); while (ch >= '0' && ch <= '9') { - numarr[arrnum++] = ch; + if (arrnum < MAXCMD) numarr[arrnum++] = ch; ch = vgetc(); } numarr[arrnum] = '\0'; - if (arrnum != 0) precount = strtol(numarr, (char **)NULL, 10); + if (arrnum != 0) precount = strtoll(numarr, (char **)NULL, 10); else precount = -1; lflag = arrnum = 0; @@ -303,7 +334,7 @@ main(argc, argv) break; case '~': if (precount < 1) precount = 1; sprintf(rep_buf, "%ld~", precount); - do_tilde(precount); + do_tilde((off_t)precount); lflag++; break; case KEY_HOME: @@ -332,6 +363,7 @@ main(argc, argv) else x = AnzAdd + Anzahl3; break; case BVICTRL('H'): + case ASCII_DEL: case KEY_BACKSPACE: case KEY_LEFT: case 'h': do { @@ -398,12 +430,12 @@ main(argc, argv) repaint(); break; case BVICTRL('D'): - if (precount > 1) scrolly = precount; - scrolldown(scrolly); + if (precount > 1) P(P_SS) = precount; + scrolldown(P(P_SS)); break; case BVICTRL('U'): - if (precount > 1) scrolly = precount; - scrollup(scrolly); + if (precount > 1) P(P_SS) = precount; + scrollup(P(P_SS)); break; case BVICTRL('E'): if (y > 0) y--; @@ -429,7 +461,7 @@ main(argc, argv) new_screen(); break; case BVICTRL('Y'): - if (y < maxy) y++; + if (y < maxy - 1) y++; scrollup(1); break; case 'A': smsg("APPEND MODE"); @@ -467,17 +499,19 @@ main(argc, argv) } break; case 'g': last_motion = current; - msg("Goto Hex Address: "); + clearstr(); + outmsg("Goto Hex Address:"); refresh(); - getcmdstr(cmdstr, 19); + getcmdstr(cmdstr, 18); + clearstr(); if (cmdstr[0] == '^') { inaddr = P(P_OF); } else if (cmdstr[0] == '$') { inaddr = filesize + P(P_OF) - 1L; } else { - long ltmp; - sscanf(cmdstr, "%lx", <mp); - inaddr = (off_t)ltmp; + off_t ltmp; + sscanf(cmdstr, "%llx", (long long unsigned *)<mp); + inaddr = ltmp; } if (inaddr < P(P_OF)) break; inaddr -= P(P_OF); @@ -485,8 +519,7 @@ main(argc, argv) setpage(mem + inaddr); } else { if (filesize == 0L) break; - sprintf(string, "Max. address of current file : %06lX", - (long)(filesize - 1L + P(P_OF))); + sprintf(string, "Max. address of current file : %06llX", (long long unsigned)(filesize - 1L + P(P_OF))); emsg(string); } break; @@ -498,11 +531,23 @@ main(argc, argv) refresh(); if (getcmdstr(line, 1)) break; last_motion = current; + hl_spat = P(P_HL); searching(ch, line, current, maxpos - 1, P(P_WS)); + if (hl_spat) { + repaint(); + } + break; + case ESC: /* un-highlight */ + hl_spat = FALSE; + repaint(); break; case 'n': /**** Search Next ****/ case 'N': last_motion = current; + hl_spat = P(P_HL); searching(ch, "", current, maxpos - 1, P(P_WS)); + if (hl_spat) { + repaint(); + } break; case 'm': do_mark(vgetc(), current); break; @@ -537,7 +582,7 @@ main(argc, argv) if ((undo_count = alloc_buf(yanked, &undo_buf)) == 0L) break; sprintf(rep_buf, "%ldP", precount); - if (do_append(yanked, yank_buf)) break; + if (do_append((off_t)yanked, yank_buf)) break; /* we save it not for undo but for the dot command memcpy(undo_buf, yank_buf, yanked); */ @@ -553,20 +598,25 @@ main(argc, argv) case 'u': do_undo(); break; case 'W': - case 'w': loc = ASCII; + case 'w': // loc = ASCII; setpage(wordsearch(current, ch)); break; case 'y': count = range(ch); if (count > 0) { - if ((yanked = alloc_buf(count, &yank_buf)) == 0L) { +/* + sprintf(string, "$%ld$", (long)yanked); + msg(string); + vgetc(); +*/ + if ((yanked = alloc_buf((off_t)count, &yank_buf)) == 0L) { break; } memcpy(yank_buf, current, yanked); } else if (count < 0) { - if ((yanked = alloc_buf(-count, &yank_buf)) == 0L) { + if ((yanked = alloc_buf(-(off_t)count, &yank_buf)) == 0L) { break; } - memcpy(yank_buf, current + count, yanked); + memcpy(yank_buf, current, yanked); } else { break; } @@ -630,11 +680,6 @@ main(argc, argv) precount = 1; undo_count = edit('i'); lflag++; -/* - } else if (count) { - sprintf(string, "%ld bytes deleted", labs(count)); - msg(string); -*/ } break; case 'x': @@ -683,13 +728,20 @@ off_t calc_size(arg) char *arg; { - long val; + off_t val; + extern int errno; char *poi; - if (*arg == '0') { - val = strtol(arg, &poi, 16); - } else { - val = strtol(arg, &poi, 10); + errno = 0; + val = strtoll(arg, &poi, 0); + if (val < 0) { + fprintf(stderr, "negative begin/size/end not allowed\n"); + usage(); + } + if (poi == arg || errno != 0) { + /* cygwin gdb displays errno incorrectly as 0 */ + fprintf(stderr, "invalid begin/size/end (hex nr 0x#, octal 0#)\n"); + usage(); } switch (*poi) { case 'k': @@ -698,6 +750,9 @@ calc_size(arg) case 'm': case 'M': val *= 1048576; break; + case 'g': + case 'G': val *= 1024*1024*1024LL; + break; case '\0': break; default: usage(); } @@ -723,7 +778,7 @@ trunc_cur() int do_append(count, buf) - int count; + off_t count; char *buf; { if (filesize + count > memsize) { diff --git a/bvi.h b/bvi.h index b019465..61285dd 100644 --- a/bvi.h +++ b/bvi.h @@ -9,10 +9,12 @@ * 2000-10-24 V 1.3.0 final * 2001-10-29 V 1.3.1 * 2003-07-04 V 1.3.2 + * 2010-08-04 V 1.3.4 + * 2014-10-01 V 1.4.0 * - * NOTE: Edit this file with tabstop=4 ! + * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2003 by Gerhard Buergmann + * Copyright 1996-2014 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -37,6 +39,8 @@ #include #include +#define JOEHTG + #if defined(__MSDOS__) && !defined(DJGPP) # include "patchlev.h" # include "dosconf.h" @@ -97,7 +101,8 @@ #define BS 8 #define ESC 27 #define SEARCH 0 -#define BVICTRL(n) (n&0x1f) +#define BVICTRL(n) (n&0x1f) +#define ASCII_DEL 0x7f #define CMDLNG(a,b) (len <= a && len >= b) @@ -129,6 +134,12 @@ #define SKIP_WHITE while(*cmd!='\0'&&isspace(*cmd))cmd++; +typedef enum _block_datum { + BLOCK_BEGIN = 1, + BLOCK_END = 2, + BLOCK_LEN = 4 +} block_datum; + #ifdef DEBUG extern FILE *debug_fp; #endif @@ -139,6 +150,8 @@ extern char *version; extern char addr_form[]; +extern char search_pat[]; +extern long hl_spat; extern char pattern[]; extern char rep_buf[]; extern int maxx, maxy, x, y; @@ -148,7 +161,7 @@ extern int AnzAdd; extern int Anzahl, Anzahl3; extern int addr_flag; extern int ignore_case, magic; -extern int screen, status; +extern int screen, status, statsize; extern PTR mem; extern PTR maxpos; extern PTR pagepos; @@ -204,7 +217,7 @@ extern off_t block_begin, block_end, block_size; int bregexec(PTR, char *); int chk_comm(int); int doecmd(char *, int); - int do_append(int, char *), do_logic(int, char *); + int do_append(off_t, char *), do_logic(int, char *); int do_delete(off_t, PTR); int doset(char *); int do_substitution(int, char *, PTR, PTR); @@ -214,6 +227,7 @@ extern off_t block_begin, block_end, block_size; PTR wordsearch(PTR, char); PTR backsearch(PTR, char); PTR fsearch(PTR, PTR, char *); + PTR fsearch_end(PTR, PTR, char *, PTR *); PTR rsearch(PTR, PTR, char *); PTR end_word(PTR); PTR calc_addr(char **, PTR); @@ -256,8 +270,10 @@ extern off_t block_begin, block_end, block_size; PTR searching(); PTR wordsearch(); PTR backsearch(); - int bregexec(); + /* int bregexec(); */ + PTR bregexec(); PTR fsearch(); + PTR fsearch_end(); PTR rsearch(); PTR end_word(); PTR calc_addr(); diff --git a/bvi.man b/bvi.man deleted file mode 100644 index b0e0b11..0000000 --- a/bvi.man +++ /dev/null @@ -1,424 +0,0 @@ -BVI(1) User Commands BVI(1) - - -NAME - bvi, bview - visual editor for binary files - -VERSION - bvi-1.3.2 - -SYNOPSIS - bvi [-R] [-c cmd] [-f script] [-b begin] [-e end] [-s size] file... - bview [-R] [-c cmd] [-f script] [-b begin] [-e end] [-s size] file... - -OPTIONS - file... - A list of filenames. The first one will be the - current file and will be read into the buffer. The - cursor will be positioned on the first line of the - buffer. You can get to the other files with the - ":next" command. - - -R "Readonly": The readonly flag is set for all the - files, preventing accidental overwriting with a write - command. - - - -b begin - causes bvi to load a file not from the start but from - offset begin. - - - -e end - causes bvi to load a file not till end but till - address end. - - - -s size - causes bvi not to load the complete file but only size - bytes. - - - -c cmd - cmd will be executed after the first file has - been read. If the cmd contains spaces it must be - enclosed in double quotes (this depends on the shell - that is used). - - -f script - This command provides a means for collecting a series - of "ex" (colon) commands into a script file, then - using this file to edit other files. Since there is no - binary stream editor "bsed", you can use this option - to make several global changes in a binary file. - -DESCRIPTION - Bvi stands for "Binary VIsual editor". Bvi is a screen - oriented editor for binary files; its command set is based - on that of the vi(1) text editor. As a binary editor does - not have the concept of "lines" there are differences from - Vi commands wherever the latter are line orientate. - -COMPARISON - The main differences between Vi and Bvi are: - - The screen is divided in three sections or panes: The byte - offset (extreme left), the hex pane (middle), and an ascii - pane (right) which shows as printable characters those - bytes in the hex pane. On an 80 column terminal there - will be sixteen hex values and their ASCII values on each - screen line. Note that (as one would expect) the first - byte has the offset '0' (zero). - - You can toggle between the hex and ascii windows with the - tab key (TAB). Toggling between these two windows does - not change the current position (offset) within the file. - - No "lines" concept: Files are treated as one long stream - of bytes. The characters "newline" and "carriage return" - are not special, id est they never mark the end of lines. - Therefore the lines on the screen do not represent lines - in the usual way. Data is broken across screen lines - arbitarily. As a consequence there are no commands in bvi - from ex or vi that are based on line numbers, eg "dd", - "yy", 'C', 'S', 'o', 'O'. This also changes the meaning - of "range" before the ":write" command to a byte offset, - ie the command ":100,200w foo" writes all *bytes* (not - lines) from offset 100 to offset 200 to the file "foo". - - No "text objects": There are also no text-specific - arrangements like words, paragraphs, sentences, sections - and so on. - - Extended "ruler": The bottom line of the screen shows the - current address (byte offset) and the current character in - these notations: - - octal, hexadecimal, decimal and ascii. - - Search patterns: All search commands understand these - special characters: - - . any character - [] set of characters - * zero or more occurrences of previous char or set - - But as there is no concept of lines you cannot use the - standard symbols ("anchors") for "begin-of-line" ('^') and - "end-of-line" ('$'). Searching for the start/end of lines - must be done explicitly by adding these special characters - to your search pattern using these meta sequences: - - \n newline - \r return - \t tab - \0 binary zero - - Additional search commands: Similar to the text search - commands there are additional hex-search functions '\' and - '#' which allow to search for any byte value. Example: - "\62 76 69" will search for the string "bvi". Spaces - between hex value are optional, so searching for - "6775636B6573" will find "guckes". - - Changing the length of data (insertion, deletion) moves - the data to other addresses; this is bad for many cases - (eg. databases, program files) and is thus disabled by - default. You can enable this commands by typing - - :set memmove - - BVI Modes: - - Command Mode (Normal Mode): - - Input is treated as command. Note that command mode is - the default mode after startup and after escaping from - input mode. Use ESC (escape) to cancel a partial - (uncompleted) command. - - Input Mode: - - Input is treated as replacement of current characters or - (after the end of the file) is appended to the current - file. This mode is entered from command mode by typing - one of 'i', 'I', 'A', 'r', or 'R'. You can enter the - characters from the keyboard (in the ASCII window) or - hexadecimal values (in the HEX window). Type TAB to - switch between these two windows. Type ESC to finish the - current input and return to command mode. Type CTRL-C to - cancel current command abnormally. - - Command line mode (Last Line Mode or : mode): - - Similar to vi, this mode is entered by typing one of the - characters : / ? \ # ! The command is terminated and - executed by typing a carriage return; to cancel a - partially typed command, type ESC to cancel the current - command and return to command mode. - -ENVIRONMENT - The editor recognizes the environment variable BVIINIT as - a command (or list of commands) to run when it starts - up. If this variable is undefined, the editor checks for - startup commands in the file ~/.bvirc file, which you - must own. However, if there is a .bvirc owned by you in - the current directory, the editor takes its startup - commands from this file - overriding both the file in your - home directory and the environment variable. - -TERMINOLOGY - Characters names are abbreviated as follows: - Abbr. ASCII name aka - CR 010 carriage return - ^A 001 control-a - ^H 008 control-h - ^I 009 control-i aka TAB - ^U 021 control-u - ^Z 026 control-z - ESC 027 escape aka ESC - DEL 127 delete - LEFT --- left arrow - RIGHT --- right arrow - DOWN --- down arrow - UP --- up arrow - -COMMAND SUMMARY - See the TERMINOLOGY for a summary on key name - abbreviations used within the following description of - commands. - - Abstract: - Arrow keys move the cursor on the screen within the - current window. - - Sample commands: - :version show version info - <- v ^ -> arrow keys move the cursor - h j k l same as arrow keys - u undo previous change - ZZ exit bvi, saving changes - :q! quit, discarding changes - /text search for text - ^U ^D scroll up or down - - Counts before bvi commands: - Numbers may be typed as a prefix to some commands. - They are interpreted in one of these ways. - - screen column | - byte of file G - scroll amount ^D ^U - repeat effect most of the rest - - Interrupting, canceling - ESC end insert or incomplete command - DEL (delete or rubout) interrupts - - File manipulation: - ZZ if file modified, write and exit; - otherwise, exit - :w write changed buffer to file - :w! write changed buffer to file, overriding - read-only ("forced" write) - :q quit when no changes have been made - :q! quit and discard all changes - :e file edit file - :e! re-read current file, discard all changes - :e # edit the alternate file - :e! # edit the alternate file, discard changes - :w file write current buffer to file - :w! file write current buffer to file overriding - read-only (this "overwrites" the file) - :sh run the command as set with option "shell", - then return - :!cmd run the command cmd from "shell", then - return - :n edit next file in the argument list - :f show current filename, modified flag, - current byte offset, and percentage of - current position within buffer - ^G same as :f - - Additional edit commands - You can insert/append/change bytes in - ASCII/binary/decimal/ hexadecimal or octal representation. - You can enter several (screen) lines of input. A line with - only a period (.) in it will terminate the command. You - must not type in values greater than a byte value. This - causes an abandonment of the command. Pressing the CR key - does not insert a newline - character into the file. If - you use ASCII mode you can use the special characters \n, - \r, \t and \0. - - :i aCR insert bytes (ASCII) at cursor position - :a bCR append bytes (Binary) at end of file - :c hCR change bytes (hexadecimal) at cursor position - - Bit-level operations - :and n bitwise 'and' operation with value n - :or n bitwise 'or' operation with value n - :xor n bitwise 'xor' operation with value n - :neg two's complement - :not logical negation - :sl i shift each byte i bits to the left - :sr i shift each byte i bits to the right - :rl i rotate each byte i bits to the left - :rr i rotate each byte i bits to the right - - Command mode addresses - :w foo write current buffer to a file - named "foo" - :5,10w foo copy byte 5 through 100 into as - file named foo - :.,.+20w foo copy the current byte and the next - 20 bytes to foo - :^,'aw foo write all bytes from the beginning - through marker 'a' - :/pat/,$ foo search pattern pat and and copy - through end of file - - Positioning within file: - ^B backward screen - ^F forward screen - ^D scroll down half screen - ^U scroll up half screen - nG go to the specified character - (end default), where n is a decimal address - /pat next line matching pat - ?pat previous line matching pat - \hex jump to next occurrence of hex string hex - #hex jump to previous occurrence of hex string hex - n repeat last search command - N repeat last search command, but in opposite - direction - - Adjusting the screen: - ^L clear and redraw screen - zCR redraw screen with current line at top of screen - z- redraw screen with current line at bottom of - screen - z. redraw screen with current line at center of - screen - /pat/z- search for pattern pat and then move currents - line to bottom - ^E scroll screen down 1 line - ^Y scroll screen up 1 line - - Marking and returning: - mx mark current position with lower-case letter x - Note: this command works for all lower-case - letters - 'x move cursor to mark x in ASCII section - `x move cursor to mark x in HEX section - '' move cursor to previous context in ASCII section - `` move cursor to previous context in HEX section - Line positioning: - H jump to first line on screen ("top") - L jump to last line on screen ("low") - M jump to middle line on screen ("middle") - - jump onto previous line on screen - + jump onto next line on screen - CR same as + - DOWN or j next line, same column - UP or k previous line, same column - - Character positioning: - ^ first byte in HEX window - $ end of screen line - l or RIGHT jump onto next byte (within current - screen line) - h or LEFT jump onto previous byte (within current - screen line) - ^H same as LEFT - space same as RIGHT - fx find next occurrence of character x - Fx find previous occurrence of character x - n| jump onto nth byte/character within current - line - - Strings: - (works similar to the strings(1) command) - Note: "Words" are defined as strings of "nonprinting - characters". - e jump to next end of word - w jump to next begin of word - b jump to previous begin of word - W forward to next string delimited with a - \0 or \n - B back to previous string delimited with a - nonprinting char - Corrections during insert: - ^H erase last character (backspace) - erase your erase character, same as ^H (backspace) - ESC ends insertion, back to command mode - - Append and replace: - A append at end of file - rx replace current bte with char 'x' - R enter replace mode; for all subsequent input, - the current byte is overwritten with the next - input character; leave replace mode with ESC. - - Miscellaneous Operations: - TAB toggle between ASCII and HEX section - - Yank and Put: - 3ySPACE yank 3 characters - p insert contents of yank buffer - o replace text with content of yank buffer - P put back at end of file - - Undo, Redo: - u undo last change - Note: Only the last change can be undone. - Therefore this commands toggles between the - last and second-t-last state of the buffer. - - Setting Options: - With the :set command you can set options in bvi - - Option Default Description - - autowrite noaw Save current file, if modified, if you - give a :n, :r or ! command - columns cm=16 on an 80 character wide terminal - ignorecase noic Ignores letter case in searching - magic nomagic Makes . [ * special in patterns - memmove nomm enables insert and delete commands - offset of=0 adds an offset to the diplayed addresses - readonly noro If set, write fails unless you use ! after command - scroll sc=1/2 window - Number of lines scrolled by ^U and ^D - showmode mo Displays statusline on bottom of the screen - terse noterse Let you obtain shorter error messages - window window=screensize - Lines in window, can be reduced at slow terminals - wordlength wl=4 Length of an ASCII-string found by w, W, b or B - wrapscan ws Searches wrap around past the end of the file - unixstyle nous The representation of ascii characters below - 32 is displayed in the statusline as shown - in ascii(7) if unset rather in DOS-style (^A) - - -AUTHOR - bvi was developed by Gerhard Buergmann, Vienna, Austria - Gerhard.Buergmann@puon.at - -WWW - Bvi Homepage: http://bvi.sourceforge.net/ - Vi Pages: http://www.guckes.net/vi/clones.php3 - (all about Vi and its clones) - -FILES - $HOME/.bvirc editor startup file - ./.bvirc editor startup file - -BUGS - Bvi does not update the screen when the terminal changes - its size. - -SEE ALSO - vi(1), strings(1), ascii(5) - -3/Jan/2004 BVI Version 1.3.2 diff --git a/comm.c b/comm.c index 3c8ad62..a83de34 100644 --- a/comm.c +++ b/comm.c @@ -10,10 +10,13 @@ * 2000-07-15 V 1.3.0 final * 2001-10-10 V 1.3.1 * 2003-07-04 V 1.3.2 + * 2005-08-17 V 1.3.3 + * 2010-06-02 V 1.3.4 + * 2014-01-28 V 1.4.0 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2003 by Gerhard Buergmann + * Copyright 1996-2014 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -102,11 +105,11 @@ docmdline(cmdline) char *cmd; char *p; size_t len; - int n, ok; + int n, ok, ret; int force = 0; int saveflag; - if (cmdline == NULL) return; + if (*cmdline == '\0') return; if (*cmdline == '"') return; /** comment **/ if (strlen(cmdline) > CMDSZ - 2) { emsg("Command too long"); @@ -115,9 +118,9 @@ docmdline(cmdline) strcpy(buff, cmdline); cmd = buff; - /* With no address given, we start at the beginning of the file and - * go to the end of the file (not line like in vi). - */ +/* With no address given, we start at the beginning of the file and + * go to the end of the file (not line like in vi). + */ addr_flag = 0; start_addr = mem; end_addr = maxpos - 1; @@ -154,7 +157,7 @@ docmdline(cmdline) return; } if (start_addr < mem) { - sprintf(string, "Negative address@- first byte is %ld", P(P_OF)); + sprintf(string, "Negative address@- first byte is %lld", (long long)P(P_OF)); emsg(string); return; } @@ -191,7 +194,7 @@ docmdline(cmdline) if (edits) msg("[No write]|[No write since last change]"); savetty(); endwin(); - system(cmdbuf + 1); + ret = system(cmdbuf + 1); fprintf(stderr, "[Hit return to continue]"); getchar(); doupdate(); @@ -304,11 +307,7 @@ docmdline(cmdline) else ok = save(c_argv[0], start_addr, end_addr, saveflag); } else { if (c_argc == 0) { - if (P(P_RO)) { - sprintf(string, "\"%s\" File is read only", name); - emsg(string); - return; - } else ok = save(name, start_addr, end_addr, saveflag); + save_chk(name, start_addr, end_addr, saveflag); } else { if (!stat(c_argv[0], &buf)) { if (saveflag == WRITE) { @@ -392,10 +391,10 @@ docmdline(cmdline) } if (chdir(c_argv[0])) sysemsg(c_argv[0]); } else if (!strncmp("edit", cmdname, len) && CMDLNG(4, 1)) { - /* - * The command ":e#" gets expanded to something like ":efile", so - * detect that case here. - */ +/* + * The command ":e#" gets expanded to something like ":efile", so + * detect that case here. + */ if (*cmd == 'e' && c_argc == 0) { if (cmd[1] == '!') (void) doecmd(&cmd[2], TRUE); @@ -626,11 +625,27 @@ yd_addr() } +/*********** Save file if not read only ********************/ +int +save_chk(fname, start, end, flags) + char *fname; + char *start; + char *end; + int flags; +{ + if (P(P_RO)) { + sprintf(string, "\"%s\" File is read only", name); + emsg(string); + return FALSE; + } + return save(fname, start, end, flags); +} + void do_exit() { if (edits) { - if (!save(name, mem, maxpos - 1L, WRITE)) return; + if (!save_chk(name, mem, maxpos - 1L, WRITE)) return; } if ((curfile + 1) < numfiles) { sprintf(string, "%d %s", numfiles - curfile - 1, morefiles); @@ -709,13 +724,20 @@ emsg(s) char *s; { int cnt; + int stchar; if (P(P_EB)) beep(); + if (P(P_MO)) { + stchar = statsize; + } else { + stchar = 0; + } + clearstr(); attrset(A_REVERSE); cnt = outmsg(s); attrset(A_NORMAL); - if (cnt >= (maxx - 25)) { /* 25 = status */ + if (cnt >= (maxx - stchar)) { addch('\n'); wait_return(TRUE); } } @@ -755,10 +777,18 @@ void msg(s) char *s; { + int stchar; + + if (P(P_MO)) { + stchar = statsize; + } else { + stchar = 0; + } clearstr(); - if (outmsg(s) >= (maxx - 25)) { /* 25 = status */ + if (outmsg(s) >= (maxx - stchar)) { addch('\n'); - wait_return(TRUE); } + wait_return(TRUE); + } } diff --git a/config.guess b/config.guess old mode 100755 new mode 100644 index 9b1384b..1f5c50c --- a/config.guess +++ b/config.guess @@ -1,13 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2002-11-30' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -16,24 +15,22 @@ timestamp='2002-11-30' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. me=`echo "$0" | sed -e 's,.*/,,'` @@ -53,8 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +62,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -98,14 +94,18 @@ trap 'exit 1' 1 2 15 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# This shell variable is my proudest work .. or something. --bje +# Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do @@ -113,15 +113,13 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; -unset files' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -134,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -156,6 +175,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -164,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -174,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -194,139 +214,119 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null - if test "$?" = 0 ; then - case `$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - rm -f $dummy.s $dummy && rmdir $tmpdir - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -334,29 +334,51 @@ EOF else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -365,10 +387,10 @@ EOF esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -380,10 +402,10 @@ EOF echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -393,38 +415,41 @@ EOF # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -448,36 +473,36 @@ EOF exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -490,29 +515,29 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -520,7 +545,7 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -535,16 +560,19 @@ EOF exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -557,28 +585,28 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -587,64 +615,84 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir + test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -672,195 +720,176 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + *:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 - exit 0 ;; + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -870,119 +899,166 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; - esac - # Determine whether the default compiler is a.out or elf + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el #else - #ifdef __INTEL_COMPILER - LIBC=gnu + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} #else - LIBC=gnuaout + CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -990,15 +1066,16 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1090,64 +1180,109 @@ EOF else echo ns32k-sni-sysv fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} - exit 0 ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1155,22 +1290,28 @@ EOF UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1181,178 +1322,55 @@ EOF UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit 0 ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - c34*) - echo c34-convex-bsd - exit 0 ;; - c38*) - echo c38-convex-bsd - exit 0 ;; - c4*) - echo c4-convex-bsd - exit 0 ;; - esac -fi - cat >&2 <. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. + +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -70,8 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +80,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +96,7 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,10 +115,18 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -144,10 +149,13 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -162,13 +170,17 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -185,6 +197,10 @@ case $os in # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -202,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -226,53 +248,112 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | clipper \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | epiphany \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | openrisc | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 | v850e \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -288,54 +369,86 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ - | clipper-* | cydra-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39 | mipstx39el \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ - | v850-* | v850e-* | vax-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -353,6 +466,9 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -367,6 +483,12 @@ case $basic_machine in basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -390,6 +512,10 @@ case $basic_machine in basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -398,10 +524,35 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -426,12 +577,27 @@ case $basic_machine in basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -454,6 +620,14 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -565,7 +739,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -604,6 +777,17 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -615,10 +799,21 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -632,10 +827,6 @@ case $basic_machine in mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -644,14 +835,29 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -716,6 +922,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -723,9 +935,12 @@ case $basic_machine in basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -743,6 +958,14 @@ case $basic_machine in basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -752,32 +975,45 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -802,6 +1038,14 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -828,6 +1072,14 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -835,6 +1087,12 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -853,6 +1111,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -901,10 +1162,6 @@ case $basic_machine in basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) basic_machine=alphaev5-cray os=-unicos @@ -913,13 +1170,9 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -934,6 +1187,10 @@ case $basic_machine in tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -977,9 +1234,16 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -988,6 +1252,10 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1007,6 +1275,9 @@ case $basic_machine in romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1023,13 +1294,10 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1073,9 +1341,12 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1096,25 +1367,31 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1132,12 +1409,15 @@ case $os in os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1150,6 +1430,9 @@ case $os in -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1171,6 +1454,9 @@ case $os in -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1193,6 +1479,9 @@ case $os in -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1223,6 +1512,17 @@ case $os in -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; + -aros*) + os=-aros + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; -none) ;; *) @@ -1245,6 +1545,12 @@ else # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1254,6 +1560,24 @@ case $basic_machine in arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1272,13 +1596,13 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1297,9 +1621,15 @@ case $basic_machine in *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1402,7 +1732,7 @@ case $basic_machine in -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) @@ -1432,9 +1762,15 @@ case $basic_machine in -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1459,7 +1795,7 @@ case $basic_machine in esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/configure b/configure index b3ad612..af7d930 100755 --- a/configure +++ b/configure @@ -1,11 +1,414 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.65. +# +# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -14,137 +417,263 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' else - as_unset=false + test -d ./-p && rmdir ./-p + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} +MFLAGS= +MAKEFLAGS= -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="bvi.c" # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #endif" +ac_subst_vars='LTLIBOBJS +LIBOBJS +EGREP +GREP +CPP +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_largefile +with_ncurses +' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP' + + # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -167,41 +696,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -223,33 +759,59 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -276,6 +838,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -300,13 +868,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -319,7 +890,7 @@ do with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -371,6 +942,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -421,26 +1002,36 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; esac - eval "with_$ac_package='$ac_optarg'" ;; + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -460,26 +1051,25 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -488,44 +1078,50 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac -done +fi -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var + # Remove trailing slashes. case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' # used to hold the argument of --host etc. +# FIXME: To remove some day. build=$build_alias host=$host_alias target=$target_alias -# FIXME: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -537,62 +1133,73 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error "pwd does not report name of working directory" + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -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_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -600,7 +1207,7 @@ ac_cv_env_CPP_value=$CPP if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. - cat < if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -EOF +Report bugs to the package provider. +_ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue - cd $ac_subdir - # A "../" for each directory in /$ac_subdir. - ac_dots=`echo $ac_subdir | - sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. - case $srcdir in - .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_subdir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; - esac +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure.gnu; then - echo - $SHELL $ac_sub_srcdir/configure.gnu --help=recursive - elif test -f $ac_sub_srcdir/configure; then - echo - $SHELL $ac_sub_srcdir/configure --help=recursive - elif test -f $ac_sub_srcdir/configure.ac || - test -f $ac_sub_srcdir/configure.in; then - echo - $ac_configure --help +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 - fi - cd $ac_popdir + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF +configure +generated by GNU Autoconf 2.65 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF - exit 0 +_ACEOF + exit fi -exec 5>config.log -cat >&5 <&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES +# -------------------------------------------- +# Tries to find the compile-time value of EXPR in a program that includes +# INCLUDES, setting VAR accordingly. Returns whether the value could be +# computed +ac_fn_c_compute_int () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=0 ac_mid=0 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid; break +else + as_fn_arith $ac_mid + 1 && ac_lo=$as_val + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=-1 ac_mid=-1 + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_lo=$ac_mid; break +else + as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + ac_lo= ac_hi= +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_hi=$ac_mid +else + as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in #(( +?*) eval "$3=\$ac_lo"; ac_retval=0 ;; +'') ac_retval=1 ;; +esac + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +static long int longval () { return $2; } +static unsigned long int ulongval () { return $2; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (($2) < 0) + { + long int i = longval (); + if (i != ($2)) + return 1; + fprintf (f, "%ld", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ($2)) + return 1; + fprintf (f, "%lu", i); + } + /* Do not output a trailing newline, as this causes \r\n confusion + on some platforms. */ + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + echo >>conftest.val; read $3 &5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_type + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ -EOF +_ACEOF +exec 5>>config.log { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -760,181 +1984,320 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= -ac_sep= -for ac_arg +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 do - case $ac_arg in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, -{ + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && + esac | + sort +) + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + ac_site_file1=$CONFIG_SITE +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - { echo "$as_me:864: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:875: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else - { echo "$as_me:883: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:899: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:903: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:909: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:911: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:913: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:932: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:934: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -942,115 +2305,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:954: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:957: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' -else - ac_path_separator=: -fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + ac_config_headers="$ac_config_headers config.h" -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:985: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } -fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:995: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:999: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:1008: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1012: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:1017: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -echo "$as_me:1024: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1033: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:1038: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -case "$host_os" in -sunos4*) - echo "$as_me:1047: result: \"using /usr/5bin/cc\"" >&5 -echo "${ECHO_T}\"using /usr/5bin/cc\"" >&6 - CC="/usr/5bin/cc" - ac_objext="o" - ;; -*) - ac_ext=c +ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -1058,177 +2317,166 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1061: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1076: found $ac_dir/$ac_word" >&5 -break +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1084: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:1087: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1096: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1111: found $ac_dir/$ac_word" >&5 -break +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1119: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - echo "$as_me:1122: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1135: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1150: found $ac_dir/$ac_word" >&5 -break +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1158: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:1161: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:1170: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1185: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1193: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1196: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + fi fi 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 "$as_me:1209: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1229: found $ac_dir/$ac_word" >&5 -break +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -1239,133 +2487,158 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1251: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:1254: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1265: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1280: found $ac_dir/$ac_word" >&5 -break +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1288: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - echo "$as_me:1291: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe 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 "$as_me:1304: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1319: found $ac_dir/$ac_word" >&5 -break +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1327: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - echo "$as_me:1330: result: no" >&5 -echo "${ECHO_T}no" >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi -test -z "$CC" && { { echo "$as_me:1342: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} - { (exit 1); exit 1; }; } + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -echo "$as_me:1347:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1350: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - echo "$as_me:1353: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1355: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:1358: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1360: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:1363: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -#line 1367 "configure" -#include "confdefs.h" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int main () @@ -1376,127 +2649,201 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1383: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1386: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:1389: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool --akim. - export ac_cv_exeext - break;; + break;; * ) break;; esac done else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1412: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} - { (exit 77); exit 77; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } -ac_exeext=$ac_cv_exeext -echo "$as_me:1418: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; -# Check the compiler produces executables we can run. If not, either + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1423: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (eval echo "$as_me:1429: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:1432: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1439: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } fi fi fi -echo "$as_me:1447: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } -rm -f a.out a.exe conftest$ac_cv_exeext +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:1454: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1456: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:1459: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1461: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:1464: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 else - { { echo "$as_me:1480: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:1486: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:1492: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 1498 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int main () @@ -1507,40 +2854,47 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1510: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:1513: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1525: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} - { (exit 1); exit 1; }; } -fi + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } +fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1532: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1536: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 1542 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int main () @@ -1553,42 +2907,35 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1557: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1560: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1563: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1566: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1578: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:1584: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 1590 "configure" -#include "confdefs.h" + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int main () @@ -1598,28 +2945,49 @@ main () return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1602: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1605: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1608: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1611: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1621: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -1635,111 +3003,941 @@ else CFLAGS= fi fi -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1648: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1651: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1654: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1657: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do - cat >conftest.$ac_ext <<_ACEOF -#line 1669 "configure" -#include "confdefs.h" -#include -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1682: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1685: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1688: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1691: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -continue + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 1701 "configure" -#include "confdefs.h" -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1713: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1716: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1719: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1722: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + fi -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; fi -rm -f conftest.$ac_objext conftest.$ac_ext + +if test "$enable_largefile" != no; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if test "${ac_cv_sys_largefile_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + break +fi +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test "${ac_cv_sys_file_offset_bits+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if test "${ac_cv_sys_large_files+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; +esac +rm -rf conftest* + fi +fi + + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done +done +if test -z "$ac_aux_dir"; then + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if test "${ac_cv_build+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if test "${ac_cv_host+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES" + +case "$host_os" in +sunos4*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"using /usr/5bin/cc\"" >&5 +$as_echo "\"using /usr/5bin/cc\"" >&6; } + CC="/usr/5bin/cc" + ac_objext="o" + ;; +*) + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1749,18 +3947,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ;; esac + case "$host_os" in solaris*) CPPFLAGS="${CPPFLAGS} -D_MSE_INT_H" - cat >>confdefs.h <<\EOF -#define NEED_PUTC_CHAR 1 -EOF + $as_echo "#define NEED_PUTC_CHAR 1" >>confdefs.h ;; hpux9*) DEFS=${DEFS-"-DMINICURSES"} ;; esac + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -1772,58 +3970,79 @@ esac # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1776: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done - ;; - esac + done + ;; +esac + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:1825: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1833,20 +4052,21 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:1841: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "${ac_cv_prog_CPP+set}" = set; then : + $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -1856,69 +4076,37 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 1862 "configure" -#include "confdefs.h" -#include - Syntax error + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error _ACEOF -if { (eval echo "$as_me:1867: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:1873: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +if ac_fn_c_try_cpp "$LINENO"; then : + else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 1896 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:1900: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:1906: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break @@ -1928,7 +4116,7 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -1940,76 +4128,44 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:1943: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 1953 "configure" -#include "confdefs.h" -#include - Syntax error + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error _ACEOF -if { (eval echo "$as_me:1958: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:1964: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +if ac_fn_c_try_cpp "$LINENO"; then : + else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 1987 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:1991: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:1997: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break @@ -2019,12 +4175,13 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { echo "$as_me:2025: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -2033,56 +4190,174 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2036: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if test "${ac_cv_path_GREP+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 2042 "configure" -#include "confdefs.h" + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #include #include #include +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:2050: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2056: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 2078 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -2092,15 +4367,14 @@ fi 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 <<_ACEOF -#line 2096 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -2110,20 +4384,21 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -#line 2117 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -2134,955 +4409,245 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + || toupper (i) != TOUPPER (i)) + return 2; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:2143: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2146: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2148: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2151: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : +if ac_fn_c_try_run "$LINENO"; then : + else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + fi fi -fi -echo "$as_me:2164: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:2180: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2186 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2192: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2195: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2198: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2201: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:2211: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6 -if test "${ac_cv_type_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2227 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((int *) 0) - return 0; -if (sizeof (int)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2242: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2245: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2248: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2251: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_int=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_int=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:2261: result: $ac_cv_type_int" >&5 -echo "${ECHO_T}$ac_cv_type_int" >&6 -echo "$as_me:2264: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6 -if test "${ac_cv_sizeof_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +$as_echo_n "checking size of int... " >&6; } +if test "${ac_cv_sizeof_int+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : + else if test "$ac_cv_type_int" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 2273 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int)) >= 0)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2285: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2288: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2291: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2294: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 2299 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2311: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2314: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2317: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2320: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (int) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_int=0 + fi fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 2336 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2348: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2351: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2354: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2357: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` + fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 2373 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2385: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2388: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2391: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2394: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_int=$ac_lo -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:2407: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -#line 2412 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -FILE *f = fopen ("conftest.val", "w"); -if (!f) - exit (1); -fprintf (f, "%d", (sizeof (int))); -fclose (f); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:2428: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2431: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2433: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2436: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_int=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f conftest.val -else - ac_cv_sizeof_int=0 -fi -fi -echo "$as_me:2452: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 -cat >>confdefs.h <&5 +$as_echo "$ac_cv_sizeof_int" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int -EOF - -echo "$as_me:2458: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6 -if test "${ac_cv_type_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2464 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((long *) 0) - return 0; -if (sizeof (long)) - return 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2479: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2482: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2485: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2488: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_long=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_long=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:2498: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6 -echo "$as_me:2501: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6 -if test "${ac_cv_sizeof_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +$as_echo_n "checking size of long... " >&6; } +if test "${ac_cv_sizeof_long+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : + else if test "$ac_cv_type_long" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 2510 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long)) >= 0)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2522: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2525: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2528: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2531: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 2536 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2548: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2551: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2554: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2557: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (long) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_long=0 + fi fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 2573 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2585: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2588: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2591: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2594: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` + fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 2610 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2622: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2625: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2628: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2631: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_long=$ac_lo -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:2644: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -#line 2649 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -FILE *f = fopen ("conftest.val", "w"); -if (!f) - exit (1); -fprintf (f, "%d", (sizeof (long))); -fclose (f); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:2665: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2668: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2670: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2673: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f conftest.val -else - ac_cv_sizeof_long=0 -fi -fi -echo "$as_me:2689: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 -cat >>confdefs.h <&5 +$as_echo "$ac_cv_sizeof_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long -EOF - -echo "$as_me:2695: checking for void *" >&5 -echo $ECHO_N "checking for void *... $ECHO_C" >&6 -if test "${ac_cv_type_void_p+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2701 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((void * *) 0) - return 0; -if (sizeof (void *)) - return 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2716: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2719: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2722: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2725: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_void_p=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_void_p=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:2735: result: $ac_cv_type_void_p" >&5 -echo "${ECHO_T}$ac_cv_type_void_p" >&6 -echo "$as_me:2738: checking size of void *" >&5 -echo $ECHO_N "checking size of void *... $ECHO_C" >&6 -if test "${ac_cv_sizeof_void_p+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 +$as_echo_n "checking size of long long... " >&6; } +if test "${ac_cv_sizeof_long_long+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_long_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (long long) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_long_long=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 +$as_echo "$ac_cv_sizeof_long_long" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 +$as_echo_n "checking size of void *... " >&6; } +if test "${ac_cv_sizeof_void_p+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : + else if test "$ac_cv_type_void_p" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 2747 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (void *)) >= 0)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2759: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2762: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2765: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2768: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 2773 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (void *)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2785: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2788: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2791: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2794: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 +as_fn_error "cannot compute sizeof (void *) +See \`config.log' for more details." "$LINENO" 5; }; } + else + ac_cv_sizeof_void_p=0 + fi fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 2810 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (void *)) >= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2822: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2825: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2828: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2831: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` + fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 2847 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (void *)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2862: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2865: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2868: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_void_p=$ac_lo -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:2881: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -#line 2886 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -FILE *f = fopen ("conftest.val", "w"); -if (!f) - exit (1); -fprintf (f, "%d", (sizeof (void *))); -fclose (f); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:2902: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2905: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2907: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2910: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_void_p=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f conftest.val -else - ac_cv_sizeof_void_p=0 -fi -fi -echo "$as_me:2926: result: $ac_cv_sizeof_void_p" >&5 -echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 -cat >>confdefs.h <&5 +$as_echo "$ac_cv_sizeof_void_p" >&6; } + + + +cat >>confdefs.h <<_ACEOF #define SIZEOF_VOID_P $ac_cv_sizeof_void_p -EOF - -echo "$as_me:2932: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2938 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2953: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2956: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2959: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2962: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_size_t=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:2972: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : + + + +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : + else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define size_t unsigned int -EOF - -fi - -echo "$as_me:2984: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2990 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((off_t *) 0) - return 0; -if (sizeof (off_t)) - return 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3005: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:3008: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3011: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3014: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_off_t=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_off_t=no + fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:3024: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6 -if test $ac_cv_type_off_t = yes; then - : + +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = x""yes; then : + else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define off_t int -EOF +_ACEOF fi -echo "$as_me:3036: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if test "${ac_cv_header_stdc+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3042 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include #include #include #include +int +main () +{ + + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:3050: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:3056: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 3078 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3092,15 +4657,14 @@ fi 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 <<_ACEOF -#line 3096 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -3110,20 +4674,21 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -#line 3117 "configure" -#include "confdefs.h" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -3134,507 +4699,590 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + || toupper (i) != TOUPPER (i)) + return 2; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3143: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3146: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3148: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3151: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : +if ac_fn_c_try_run "$LINENO"; then : + else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + fi fi -fi -echo "$as_me:3164: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi for ac_header in fcntl.h termcap.h termio.h termios.h unistd.h term.h ncurses/term.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3177: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3183 "configure" -#include "confdefs.h" -#include <$ac_header> +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -if { (eval echo "$as_me:3187: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:3193: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:3212: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for ncurses.h... $ECHO_C" >&6 -if test "${ac_cv_header_ncurses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" +if test "x$ac_cv_header_ncurses_h" = x""yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5 +$as_echo_n "checking for library containing initscr... " >&6; } +if test "${ac_cv_search_initscr+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3242 "configure" -#include "confdefs.h" -#include + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); +int +main () +{ +return initscr (); + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:3246: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:3252: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag +for ac_lib in '' ncurses; do + if test -z "$ac_lib"; then + ac_res="none required" else - ac_cpp_err= + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi -else - ac_cpp_err=yes + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_initscr=$ac_res fi -if test -z "$ac_cpp_err"; then - ac_cv_header_ncurses_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_ncurses_h=no +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_initscr+set}" = set; then : + break fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:3271: result: $ac_cv_header_ncurses_h" >&5 -echo "${ECHO_T}$ac_cv_header_ncurses_h" >&6 -if test $ac_cv_header_ncurses_h = yes; then - echo "$as_me:3274: checking for initscr in -lncurses" >&5 -echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6 -if test "${ac_cv_lib_ncurses_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lncurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3282 "configure" -#include "confdefs.h" +done +if test "${ac_cv_search_initscr+set}" = set; then : -/* Override any gcc2 internal prototype to avoid an error. */ +else + ac_cv_search_initscr=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_initscr" >&5 +$as_echo "$ac_cv_search_initscr" >&6; } +ac_res=$ac_cv_search_initscr +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + $as_echo "#define HAVE_NCURSES_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5 +$as_echo_n "checking for library containing tputs... " >&6; } +if test "${ac_cv_search_tputs+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr (); +char tputs (); int main () { -initscr (); +return tputs (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3301: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3304: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3307: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3310: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ncurses_initscr=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_ncurses_initscr=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:3321: result: $ac_cv_lib_ncurses_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6 -if test $ac_cv_lib_ncurses_initscr = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_H 1 -EOF - LIBS="${LIBS} -lncurses" -else - echo "$as_me:3329: checking for initscr in -lcurses" >&5 -echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 -if test "${ac_cv_lib_curses_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3337 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char initscr (); -int -main () -{ -initscr (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3356: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3359: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3362: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3365: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_curses_initscr=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_curses_initscr=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:3376: result: $ac_cv_lib_curses_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 -if test $ac_cv_lib_curses_initscr = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_CURSES_H 1 -EOF - LIBS="${LIBS} -lcurses" -else - { { echo "$as_me:3384: error: bvi requires the curses library" >&5 -echo "$as_me: error: bvi requires the curses library" >&2;} - { (exit 1); exit 1; }; } -fi - -fi - -else - echo "$as_me:3392: checking for curses.h" >&5 -echo $ECHO_N "checking for curses.h... $ECHO_C" >&6 -if test "${ac_cv_header_curses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3398 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:3402: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:3408: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag +for ac_lib in '' tinfo; do + if test -z "$ac_lib"; then + ac_res="none required" else - ac_cpp_err= + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi -else - ac_cpp_err=yes + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_tputs=$ac_res fi -if test -z "$ac_cpp_err"; then - ac_cv_header_curses_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_curses_h=no +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_tputs+set}" = set; then : + break fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:3427: result: $ac_cv_header_curses_h" >&5 -echo "${ECHO_T}$ac_cv_header_curses_h" >&6 -if test $ac_cv_header_curses_h = yes; then - echo "$as_me:3430: checking for initscr in -lcurses" >&5 -echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 -if test "${ac_cv_lib_curses_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3438 "configure" -#include "confdefs.h" +done +if test "${ac_cv_search_tputs+set}" = set; then : -/* Override any gcc2 internal prototype to avoid an error. */ +else + ac_cv_search_tputs=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tputs" >&5 +$as_echo "$ac_cv_search_tputs" >&6; } +ac_res=$ac_cv_search_tputs +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5 +$as_echo_n "checking for library containing initscr... " >&6; } +if test "${ac_cv_search_initscr+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char initscr (); int main () { -initscr (); +return initscr (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3457: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3460: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3463: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3466: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_curses_initscr=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_curses_initscr=no +for ac_lib in '' curses; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_initscr=$ac_res fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:3477: result: $ac_cv_lib_curses_initscr" >&5 -echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 -if test $ac_cv_lib_curses_initscr = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_CURSES_H 1 -EOF - LIBS="${LIBS} -lcurses" -else - { { echo "$as_me:3485: error: bvi requires the curses library" >&5 -echo "$as_me: error: bvi requires the curses library" >&2;} - { (exit 1); exit 1; }; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_initscr+set}" = set; then : + break fi +done +if test "${ac_cv_search_initscr+set}" = set; then : else - { { echo "$as_me:3491: error: bvi requires the curses library" >&5 -echo "$as_me: error: bvi requires the curses library" >&2;} - { (exit 1); exit 1; }; } + ac_cv_search_initscr=no fi - +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_initscr" >&5 +$as_echo "$ac_cv_search_initscr" >&6; } +ac_res=$ac_cv_search_initscr +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -for ac_func in strdup strtol strerror memmove -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3501: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo "#define HAVE_CURSES_H 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5 +$as_echo_n "checking for library containing tputs... " >&6; } +if test "${ac_cv_search_tputs+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3507 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); - +char tputs (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; -#endif - +return tputs (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3538: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3541: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3544: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3547: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" +for ac_lib in '' tinfo; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_tputs=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_tputs+set}" = set; then : + break +fi +done +if test "${ac_cv_search_tputs+set}" = set; then : + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_var=no" + ac_cv_search_tputs=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:3557: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 +$as_echo "$ac_cv_search_tputs" >&6; } +ac_res=$ac_cv_search_tputs +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +else + + as_fn_error "bvi requires the curses library" "$LINENO" 5 +fi + +fi + +else + + ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" +if test "x$ac_cv_header_curses_h" = x""yes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5 +$as_echo_n "checking for library containing initscr... " >&6; } +if test "${ac_cv_search_initscr+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); +int +main () +{ +return initscr (); + ; + return 0; +} +_ACEOF +for ac_lib in '' curses; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_initscr=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_initscr+set}" = set; then : + break +fi +done +if test "${ac_cv_search_initscr+set}" = set; then : + +else + ac_cv_search_initscr=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_initscr" >&5 +$as_echo "$ac_cv_search_initscr" >&6; } +ac_res=$ac_cv_search_initscr +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + $as_echo "#define HAVE_CURSES_H 1" >>confdefs.h + +else + + as_fn_error "bvi requires the curses library" "$LINENO" 5 +fi + +else + + as_fn_error "bvi requires the curses library" "$LINENO" 5 +fi + + +fi + + + + +for ac_func in strdup strtol strtoll strerror memmove +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi done -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:3579: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } +if test "${ac_cv_sys_largefile_source+set}" = set; then : + $as_echo_n "(cached) " >&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include /* for off_t */ + #include +int +main () +{ +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_sys_largefile_source=no; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGEFILE_SOURCE 1 +#include /* for off_t */ + #include +int +main () +{ +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_sys_largefile_source=1; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_cv_sys_largefile_source=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 +$as_echo "$ac_cv_sys_largefile_source" >&6; } +case $ac_cv_sys_largefile_source in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source +_ACEOF +;; +esac +rm -rf conftest* + +# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +# in glibc 2.1.3, but that breaks too many other things. +# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +if test $ac_cv_sys_largefile_source != unknown; then + +$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi + +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDLIB_H 1 +_ACEOF + fi -echo "$as_me:3628: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 +$as_echo_n "checking for GNU libc compatible malloc... " >&6; } +if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_malloc_0_nonnull=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H +# include +#else +char *malloc (); +#endif + +int +main () +{ +return ! malloc (0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_malloc_0_nonnull=yes +else + ac_cv_func_malloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } +if test $ac_cv_func_malloc_0_nonnull = yes; then : + +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h + +else + $as_echo "#define HAVE_MALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" malloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" + ;; +esac + + +$as_echo "#define malloc rpl_malloc" >>confdefs.h + +fi + + +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDLIB_H 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 +$as_echo_n "checking for GNU libc compatible realloc... " >&6; } +if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_realloc_0_nonnull=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H +# include +#else +char *realloc (); +#endif + +int +main () +{ +return ! realloc (0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_realloc_0_nonnull=yes +else + ac_cv_func_realloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } +if test $ac_cv_func_realloc_0_nonnull = yes; then : + +$as_echo "#define HAVE_REALLOC 1" >>confdefs.h + +else + $as_echo "#define HAVE_REALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" realloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS realloc.$ac_objext" + ;; +esac + + +$as_echo "#define realloc rpl_realloc" >>confdefs.h + +fi + + -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ac_config_files="$ac_config_files Makefile" @@ -3648,7 +5296,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -3656,39 +5304,59 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if cmp -s $cache_file confcache; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -3697,141 +5365,480 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:3720: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false +ac_cs_recheck=false +ac_cs_silent=false + SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` -if expr a : '\(a\)' >/dev/null 2>&1; then +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -as_executable_p="test -f" -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' else - as_unset=false + test -d ./-p && rmdir ./-p + as_mkdir_p=false fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by $as_me, which was +generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" _ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] + --file=FILE[:TEMPLATE] instantiate the configuration file FILE - --header=FILE[:TEMPLATE] + --header=FILE[:TEMPLATE] instantiate the configuration header FILE Configuration files: @@ -3840,118 +5847,136 @@ $config_files Configuration headers: $config_headers -Report bugs to ." -EOF +Report bugs to the package provider." -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" -EOF -cat >>$CONFIG_STATUS <<\EOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:3893: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:3912: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; esac shift done -exec 5>>config.log -cat >&5 << _ACEOF +ac_configure_extra_args= -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## - -This file was extended by $as_me 2.52, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi _ACEOF -EOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:3949: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -3961,487 +5986,541 @@ if $ac_need_defaults; then test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers fi -# Create a temporary directory, and hook for its removal unless debugging. +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} + { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=$TMPDIR/cs$$-$RANDOM - (umask 077 && mkdir $tmp) -} || + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$tmp/subs1.awk" && +_ACEOF + + { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line } -EOF +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || as_fn_error "could not setup config files machinery" "$LINENO" 5 +_ACEOF -cat >>$CONFIG_STATUS <\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t -s,@LIBS@,$LIBS,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CPP@,$CPP,;t t -CEOF - -EOF - - cat >>$CONFIG_STATUS <<\EOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS " +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + esac ;; esac -done; } - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` - else - ac_dir_suffix= ac_dots= - fi + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac +_ACEOF - if test x"$ac_file" != x-; then - { echo "$as_me:4163: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4181: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:4194: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 -done -EOF -cat >>$CONFIG_STATUS <<\EOF +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - test x"$ac_file" != x- && { echo "$as_me:4255: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4266: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:4279: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -EOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\EOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -EOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\EOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -EOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs - -cat >>$CONFIG_STATUS <<\EOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:4396: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - fi - rm -f $ac_file - mv $tmp/config.h $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else - cat $tmp/config.h - rm -f $tmp/config.h + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error "could not create -" "$LINENO" 5 fi -done -EOF + ;; -cat >>$CONFIG_STATUS <<\EOF -{ (exit 0); exit 0; } -EOF -chmod +x $CONFIG_STATUS + esac + +done # for ac_tag + + +as_fn_exit 0 +_ACEOF ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. # Unfortunately, on DOS this fails, as config.log is still kept open @@ -4452,11 +6531,18 @@ ac_clean_files=$ac_clean_files_save # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff --git a/configure.in b/configure.ac similarity index 65% rename from configure.in rename to configure.ac index 68076d8..dd12369 100644 --- a/configure.in +++ b/configure.ac @@ -1,9 +1,12 @@ dnl Process this file with autoconf to produce a configure script. + AC_INIT AC_CONFIG_SRCDIR([bvi.c]) AC_CONFIG_HEADER(config.h) +AC_SYS_LARGEFILE AC_CANONICAL_HOST +CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES" dnl On SunOS4 systems you have to use the /usr/5bin/cc compiler dnl to get the SYSV curses library: @@ -37,6 +40,7 @@ AC_PROG_INSTALL dnl Check for typedefs AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(void *) AC_CHECK_TYPE(size_t, unsigned int) @@ -58,24 +62,29 @@ AC_ARG_WITH(ncurses, fi ]) -AC_CHECK_HEADER(ncurses.h, - AC_CHECK_LIB(ncurses, initscr, - AC_DEFINE(HAVE_NCURSES_H) LIBS="${LIBS} -lncurses", - AC_CHECK_LIB(curses, initscr, - AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses", - AC_MSG_ERROR([bvi requires the curses library]))), - AC_CHECK_HEADER(curses.h, - AC_CHECK_LIB(curses, initscr, - AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses", - AC_MSG_ERROR([bvi requires the curses library])), - AC_MSG_ERROR([bvi requires the curses library]))) +AC_CHECK_HEADER([ncurses.h],[ + AC_SEARCH_LIBS([initscr], [ncurses],[ + AC_DEFINE(HAVE_NCURSES_H) + AC_SEARCH_LIBS([tputs], [tinfo])], [ + AC_SEARCH_LIBS([initscr], [curses],[ + AC_DEFINE(HAVE_CURSES_H) + AC_SEARCH_LIBS([tputs], [tinfo])],[ + AC_MSG_ERROR([bvi requires the curses library])])])],[ + AC_CHECK_HEADER([curses.h],[ + AC_SEARCH_LIBS([initscr], [curses], [ + AC_DEFINE(HAVE_CURSES_H)],[ + AC_MSG_ERROR([bvi requires the curses library])])],[ + AC_MSG_ERROR([bvi requires the curses library])])]) dnl Checks for typedefs, structures, and compiler characteristics. dnl AC_TYPE_SIZE_T dnl Checks for library functions. dnl AC_TYPE_SIGNAL -AC_CHECK_FUNCS(strdup strtol strerror memmove) +AC_CHECK_FUNCS(strdup strtol strtoll strerror memmove) +AC_FUNC_FSEEKO +AC_FUNC_MALLOC +AC_FUNC_REALLOC AC_PROG_INSTALL diff --git a/configure.scan b/configure.scan deleted file mode 100644 index b5c11ff..0000000 --- a/configure.scan +++ /dev/null @@ -1,27 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(bvi.c) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET - -dnl Checks for libraries. -dnl Replace `main' with a function in -lcurses: -AC_CHECK_LIB(curses, main) -dnl Replace `main' with a function in -lncurses: -AC_CHECK_LIB(ncurses, main) - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h unistd.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_TYPE_SIZE_T - -dnl Checks for library functions. -AC_TYPE_SIGNAL -AC_CHECK_FUNCS(strdup strtol) - -AC_OUTPUT(Makefile) diff --git a/edit.c b/edit.c index 328a0cd..9db8372 100644 --- a/edit.c +++ b/edit.c @@ -9,8 +9,10 @@ * 2000-07-15 V 1.3.0 final * 2001-12-07 V 1.3.1 * 2003-07-04 V 1.3.2 + * 2006-04-05 V 1.3.3 alpha - binary representation + * 2014-09-30 V 1.4.0 * - * Copyright 1996-2003 by Gerhard Buergmann + * Copyright 1996-2014 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -29,7 +31,7 @@ #include "bvi.h" #include "set.h" -extern int precount; +extern long precount; char contrd[][4] = {"NUL", " ^A", " ^B", " ^C", " ^D", " ^E", " ^F", "BEL", " BS", "TAB", " NL", "HOM", "CLR", " CR", " ^N", " ^O", @@ -42,7 +44,8 @@ char contru[][4] = {"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL", "CAN", " EM", "SUB", "ESC", " FS", " GS", " RS", " US", "DEL" }; char tmpbuf[10]; -char linbuf[256]; +char linbuf[16384]; +long hl_spat = 0; static char getcbuff[BUFFER]; static char *getcnext = NULL; @@ -113,7 +116,9 @@ edit(mode) setcur(); continue; } - if (ch == KEY_BACKSPACE || ch == BVICTRL('H')) { + if (ch == KEY_BACKSPACE + || ch == ASCII_DEL + || ch == BVICTRL('H')) { if (count > 0) { len--; count--; @@ -275,7 +280,7 @@ escape: } -/* Do the f, F, t ot T command +/* Do the f, F, t or T command * If flag == 1 save the character in rep_buf * else setpage() */ @@ -290,14 +295,30 @@ do_ft(ch, flag) PTR ptr; switch (ch) { + /* case 1: beep(); - return NULL; /* no previous command */ + return NULL; no previous command case -1: if (chp == 'f' || chp == 't') dir = BACKWARD; else dir = FORWARD; - break; /* same again */ + break; case 0: if (chp == 'f' || chp == 't') dir = FORWARD; else dir = BACKWARD; - break; /* same again */ + break; + */ + case -1: if (chp == 1) { + beep(); + return NULL; + } + if (chp == 'f' || chp == 't') dir = BACKWARD; + else dir = FORWARD; + break; + case 0: if (chp == 1) { + beep(); + return NULL; + } + if (chp == 'f' || chp == 't') dir = FORWARD; + else dir = BACKWARD; + break; default: chp = ch; if (chp == 'f' || chp == 't') dir = FORWARD; else dir = BACKWARD; @@ -324,7 +345,10 @@ do_ft(ch, flag) if (ptr < mem) break; } } while (--precount > 0); + /* if (*ptr == chi) { + */ + if (ptr >= mem && ptr <= maxpos) { if (loc == HEX) toggle(); if (chp == 't') ptr--; if (chp == 'T') ptr++; @@ -434,15 +458,20 @@ setcur() void statpos() { + char bin_val [9]; unsigned char Char1; + int i; off_t bytepos; - char string[30], str[6]; + char string[MAXCMD+1], str[6]; if (!P(P_MO)) return; bytepos = current - mem; if (bytepos >= filesize) { - mvaddstr(maxy, status, " "); - return; } + // mvaddstr(maxy, status, " "); + move(maxy, status); + for (i = status; i < maxx; i++) addch(' '); + return; + } Char1 = *(mem + bytepos); if (isprint(Char1)) { @@ -453,11 +482,22 @@ statpos() } else if (Char1 == 127) { if (P(P_US)) strcpy(str, contru[32]); else strcpy(str, contrd[32]); - } else strcpy(str, " "); - - sprintf(string, "%08lX \\%03o 0x%02X %3d %3s", - (long)(bytepos + P(P_OF)), Char1, Char1, Char1, str); + } else { + strcpy(str, " "); + } + for (i = 0; i < 8; ++i) { + if(Char1 & (1< maxpos) { strcpy(linbuf, "~ "); } else { - sprintf(linbuf, addr_form, (long)(mempos - mem + P(P_OF))); + + sprintf(linbuf, addr_form, (long long)(mempos - mem + P(P_OF))); *string = '\0'; } + mvaddstr(scpos, mv_pos, linbuf); + mv_pos = AnzAdd; + *linbuf = '\0'; + if (hl_spat) { + f_start = (mempos - Anzahl) < mem ? mem : (mempos - Anzahl); + f_end = mempos + (2 * Anzahl); + hl_start = fsearch_end(f_start, f_end, search_pat, &hl_end); + } + for (print_pos = 0; print_pos < Anzahl; print_pos++) { + if (hl_spat) { + while (hl_start != NULL) { + if (hl_start < mempos) { + if (hl_end < mempos) { + f_start = hl_start + 1; + hl_start = fsearch_end(f_start, f_end, search_pat, &hl_end); + } else { + attrset(A_STANDOUT); /* start out highlighted */ + break; + } + } else if (hl_start >= mempos) { + break; + } + } + if (hl_start != NULL) { + if ((hl_start - mempos) == print_pos) { + mvaddstr(scpos, mv_pos, linbuf); + mv_pos = AnzAdd + (3 * print_pos); + *linbuf = '\0'; + attrset(A_STANDOUT); + } + if ((hl_end - mempos) == print_pos) { + mvaddstr(scpos, mv_pos, linbuf); + *linbuf = '\0'; + mv_pos = AnzAdd + (3 * print_pos); + f_start = hl_end; + hl_start = fsearch_end(f_start, f_end, search_pat, &hl_end); + if (f_start != hl_start) { + attrset(A_NORMAL); + } + } + } + } if (mempos + print_pos >= maxpos) { sprintf(tmpbuf, " "); - Zeichen = ' '; + cur_ch = ' '; } else { - Zeichen = *(mempos + print_pos); - sprintf(tmpbuf, "%02X ", Zeichen); + cur_ch = *(mempos + print_pos); + sprintf(tmpbuf, "%02X ", cur_ch); } strcat(linbuf, tmpbuf); - if (isprint(Zeichen)) - *(string + print_pos) = Zeichen; + if (isprint(cur_ch)) + *(string + print_pos) = cur_ch; else *(string + print_pos) = '.'; } + mvaddstr(scpos, mv_pos, linbuf); + mv_pos = AnzAdd + (3 * print_pos); + attrset(A_NORMAL); *(string + Anzahl) = '\0'; - strcat(linbuf, string); - mvaddstr(scpos, 0, linbuf); + mvaddstr(scpos, mv_pos, string); } @@ -639,11 +729,22 @@ fileinfo(fname) char *fname; { off_t bytepos; - char fstatus[64]; + char fstatus[MAXCMD]; + char *string; if (fname) { + string = malloc((size_t)strlen(fname) + MAXCMD); + if (string == NULL) { + emsg("Out of memory"); + return; + } sprintf(string, "\"%s\" ", fname); } else { + string = malloc(MAXCMD); + if (string == NULL) { + emsg("Out of memory"); + return; + } strcpy(string, "No file "); } if (filemode != NEW && filemode != REGULAR) @@ -652,13 +753,16 @@ fileinfo(fname) if (edits) strcat(string, "[Modified] "); if (filesize) { bytepos = (pagepos + y * Anzahl + xpos()) - mem + 1L; - sprintf(fstatus, "byte %lu of %lu --%lu%%--", (long)bytepos, - (long)filesize, (long)(bytepos * 100L / filesize)); + sprintf(fstatus, "byte %llu of %llu --%llu%%--", + (unsigned long long)bytepos, + (unsigned long long)filesize, + (unsigned long long)(bytepos * 100L / filesize)); strcat(string, fstatus); } else { strcat(string, " 0 bytes"); } msg(string); + free(string); } @@ -856,7 +960,7 @@ do_ins_chg(start, arg, mode) repaint(); goto mfree; } - do_append(count, tempbuf); + do_append((off_t)count, tempbuf); memcpy(undo_buf, tempbuf, count); repaint(); break; diff --git a/html/bmore.html b/html/bmore.html deleted file mode 100644 index 86d9962..0000000 --- a/html/bmore.html +++ /dev/null @@ -1,159 +0,0 @@ - - -BVI: bmore - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
 -Commands
-Options
-man - Page
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-bmore - - -BVI -
-
-
- -

-bmore is a filter that displays the contents of a binary -file on the terminal, one screenful at a time. It normally pauses after each -screenful, and prints --More-- at the bottom of the screen. -bmore provides a two-line over­ lap between screens for -continuity. If bmore is reading from a file rather than a pipe, -the percentage of characters displayed so far is also shown. -

-bmore scrolls up to display one more screen line in -response to a RETURN character; it displays another -screenful in response to a SPACE character. Other commands are listed below. -

-The screen is divided in three sections or panes: The byte -offset (extreme left), the hex pane (middle), and an ascii -pane (right) which shows as printable characters those -bytes in the hex pane. On an 80 column terminal there -will be sixteen hex values and their ASCII values on each -screen line (can be changed with the -n option). -

-Note that (as one would expect) the first -byte has the offset 0 (zero). -

-

- - - -
-000000
-00000C
-000018
-000024
-000030
-00003C
-000048
-000054
-000060
-*
-00016C
-000178
-000184
-000190
-00009C
- 7F 45 4C 46 01 01
- 00 00 00 00 01 00
- 00 00 00 00 00 00
- 00 00 00 00 34 00
- 0C 00 09 00 00 00
- 00 00 00 00 55 89
- 53 C7 45 A4 00 00
- 00 00 00 83 7D 08
- 8C 02 00 00 E9 6F
-
- 00 00 00 00 6A 03
- 45 08 50 E8 FC FF
- 0C 85 D2 75 17 6A
- E9 43 02 00 00 8D
- 0C 85 D2 75 0D C7
- 01 00 00 00 00 00
- 03 00 01 00 00 00
- 00 00 0C 07 00 00
- 00 00 00 00 28 00
- 00 00 00 00 00 00
- E5 83 EC 68 57 56
- 00 00 C7 45 A0 01
- 00 75 13 6A 00 E8
- 02 00 00 8D B4 26
-
- 68 90 00 00 00 8B
- FF FF 89 C2 83 C4
- 01 E8 60 02 00 00
- 74 26 00 8D BC 27
- 45 A0 00 00 00 00
- .ELF........
- ............
- ............
- ....4.....(.
- ............
- ....U....hWV
- S.E......E..
- ....}..u.j..
- .....o.....&
-
- ....j.h.....
- E.P.........
- ...u.j..`...
- .C....t&...'
- ...u..E.....
---More--(5%) -
-
-

-Equal lines will only displayed once, a star (*) is the placeholder -for one or more lines equal to the line above. -

-

- -Back to the top - -

-Last update: October 13th 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/bmore_cmd.html b/html/bmore_cmd.html deleted file mode 100644 index 1b40a7d..0000000 --- a/html/bmore_cmd.html +++ /dev/null @@ -1,116 +0,0 @@ - - -BVI: Commands - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-Commands
 -Options
-man - Page
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-bmore -
Commands -		 - -BVI -
-
-
- -

- - -Most commands optionally preceded by integer argument k. Defaults in brackets. -Star (*) indicates argument becomes new default. -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SPACEDisplay next k lines of bytes current screen size
zDisplay next k lines of bytes current screen size*
RETURNDisplay next k lines of bytes 1*
d or CTRL D - Scroll k lines current scroll size, initially 11*
q or Q or InterruptExit from bmore
sSkip forward k lines of bytes 1
fSkip forward k screenfuls of bytes 1
b or CTRL B - Skip backwards k screenfuls of bytes 1
'Go to place where previous search started
=Display current byte number
/regular exprSearch for kth occurrence of ascii regular expr 1
\regular exprSearch for kth occurrence of binary regular expr 1
nSearch for kth occurrence of last r.e 1
!cmd or :!cmd - Execute cmd in a subshell
vStart up bvi at current position
wStart up bvi reading only a screenful of bytesscreen
CTRL LRedraw screen
:nGo to kth next file1
:pGo to kth previous file1
:fDisplay current file name and byte position
.Repeat previous command
-

-

- -Back to the top - -

-Last update: Fri Jun 30 22:05:32 CEST 2000 by Gerhard Bürgmann -
- diff --git a/html/bmore_opt.html b/html/bmore_opt.html deleted file mode 100644 index 435fda5..0000000 --- a/html/bmore_opt.html +++ /dev/null @@ -1,142 +0,0 @@ - - -BVI: Command Line Options - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-Commands
-Options
 -man - Page
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-bmore -
Command Line Options -		 - -BVI -
-
-
- -

- - - - - - - - - - - - - - -
-aASCII mode
-cClear before displaying. Redrawing the screen -instead of scrolling. Can be useful, if you change the number of -displayed lines.
-dDisplay error messages rather than ringing the -terminal bell if an unrecognized command is used. -This is helpful for inexperienced users. -
-iIgnore case for searching.
-n linesDisplays the indicated number of lines in each screenful, -rather than the default (the number of lines in the terminal screen less two).
-w cols -Display number of cols (bytes of data) in each line.
+linenumberStart up at linenumber
+/ASCII-patternStart up at the line containing the regular expression -ASCII-pattern
+\HEX-patternStart up at the line containing the regular expression -HEX-pattern
-

-This is the default display:

-
- -
-
-00000000  7F 45 4C 46 01 01 01 00 00 00 00 00 00 00 00 00 .ELF............
-00000010  01 00 03 00 01 00 00 00 00 00 00 00 00 00 00 00 ................
-00000020  F4 60 00 00 00 00 00 00 34 00 00 00 00 00 28 00 .`......4.....(.
-00000030  0F 00 0C 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
-00000040  55 89 E5 68 04 00 00 00 68 4C 00 00 00 68 00 00 U..h....hL...h..
-00000050  00 00 E8 FC FF FF FF 6A 01 E8 FC FF FF FF 89 F6 .......j........
-00000060  55 89 E5 83 EC 14 57 56 53 8B 7D 0C C7 45 FC 00 U.....WVS.}..E..
-00000070  00 00 00 C7 45 F8 00 00 00 00 C7 45 F4 00 00 00 ....E......E....
-00000080  00 BE 01 00 00 00 6A 2F 8B 07 50 E8 FC FF FF FF ......j/..P.....
-00000090  83 C4 08 85 C0 74 09 40 EB 08 8D B6 00 00 00 00 .....t.@........
-000000A0  8B 07 50 68 04 00 00 00 E8 FC FF FF FF 83 C4 08 ..Ph............
-000000B0  68 85 00 00 00 68 04 00 00 00 E8 FC FF FF FF 83 h....h..........
-000000C0  C4 08 39 75 08 0F 8E 35 01 00 00 8B 04 B7 89 45 ..9u...5.......E
-000000D0  EC 8A 10 80 FA 2B 0F 84 94 00 00 00 80 FA 2D 0F .....+........-.
-000000E0  85 EB 00 00 00 BB 01 00 00 00 80 78 01 00 0F 84 ...........x....
-000000F0  D1 00 00 00 8B 4D EC 8A 04 0B 3C 64 74 32 7F 10 .....M....^dt2..
---More--(5%) -
-

-With the -a option the display looks like this: -

-
- -
-
-00000000  .ELF....................@...4... .......4. ...(.........4...4...
-00000040  4...............................................................
-00000080  .....1...1...............1..............,................4......
-000000C0  .................................... ... .........../lib/ld-linu
-00000100  x.so.2..............GNU.................%...8.......4... .......
-00000140  ........,.......6.......................3...!...........%...1...
-00000180  ....7..............."...........2...&...+...)...................
-000001C0  ................................................................
-00000200  ................................................................
-00000240  ............................#...........(...................'...
-00000280  *...$.......-.../.......0.......5...................U...........
-000002C0  .... .......................g.......(...........................
-00000300  ............t...-...........5...............o...............$...
-00000340  ........................$...............4...............D...H...
-00000380  ....y...T...............d...............t...........1...d.......
-000003C0  ................................-...................j...........
---More--(18%) -
-
-

 

-

- -Back to the top - -

-Last update: January 4th 2004 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/bvi.css b/html/bvi.css deleted file mode 100644 index cd92b89..0000000 --- a/html/bvi.css +++ /dev/null @@ -1,11 +0,0 @@ -TD {font-family: Helvetica, Arial, sans-serif;} -TH {font-family: Helvetica, Arial, sans-serif;} -STRONG {color:red;} -.thl {font-family: Helvetica, Arial Narrow, sans-serif; font-size: 12pt; font-weight: bold; text-decoration:none;} -.ths {font-family: Helvetica, Arial Narrow, sans-serif; font-size: 10pt; text-decoration:none;} -.btop {text-decoration:none; color:black;} -.examp {font-family: Courier, monospace;} -.inv {font-family: Courier, monospace; color: rgb(255,255,255); background-color: rgb(0,0,0);} -.head {font-family: Helvetica, Arial, sans-serif; font-size: 22pt; font-weight: bold; text-decoration:none;} -.sub {font-family: Helvetica, Arial, sans-serif; font-size: 16pt; font-weight: bold;} -.new {font-family: Times, serif; font-weight: bold; font-size: 28pt; color: red;} diff --git a/html/colon.html b/html/colon.html deleted file mode 100644 index b3b3ddf..0000000 --- a/html/colon.html +++ /dev/null @@ -1,209 +0,0 @@ - -BVI: Colon (ex) Commands - - - - - - -
-Command Overview -
Colon (ex) Commands -		 - -BVI -
-
-
-

- -

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

-

-When forming a colon command, the first character, the colon, can be -followed by zero, one or two addresses. These addresses are byte -addresses, in contrast to vi, which uses line addresses.
-The byte addresses can be given in decimal notation or, with a -leading zero, in hexadecimal notation. If you have specified an -address offset (e.g. :set offset=256), this offset has to be -added to the byte addresses.
-Without an address, the whole file is affected or the current cursor -position is used (depending of the command). -

-

- - - - - - - - - - - - -
AddressCorresponding bytes
.The current byte
7The seventh byte of file (if offset=0)
.-nn bytes before the current byte
.+nn bytes after the current byte
'xThe byte marked with x
^The first byte in file
$The last byte
''The previous current byte
/pat/The first byte that matches pat
#12 A4 6F#The first byte that matches hex pattern
-
-
- - - - - - - - - - - - - - - - - - -
CommandBVIVI
File
Commands		 - - - -
:w
- :w %.new
- :w filename
- :w>> existingfile
- :w! file
- :e newfile
- :e!
- :f
- :f newname
- 		Write to the current file
- Write to current.new
- Write to filename
- Append to existing file
- Overwrite existing file
- Terminate session and edit newfile
- Reload the current file
- Prints current filename and some additional info
- Changes the current filename to newname -
-
Substitute
Commands		 - - - -
:s/pattern/replace/
- :s/pattern/replace/g
- :s/pattern/replace/gc		Search for pattern and replace it once
- Search for pattern and replace it global
- Search for pattern and replace it global conditional (ask) -
-
- - - -
:s\80 af\ff ff\Binary search and replace -
- 		Not available
Edit
Commands		 - - - -
:a m
- :c m  
- :i m		append
- change
- insert - bytes, where m is a(scii), b(inary), d(ecimal), h(exadecimal) - or o(ctal). You can type in several (screen) lines of bytes, a line - with only a '.' in it terminates the command. -
-		 -Usually not available in vi but in ex (without the m - modifier). -
Logical
Operations		 - - - -
:and n
- :or n
- :xor n
- :neg
- :not
- :sl i
- :sr i
- :rr i
- :rl i		and n
- or n
- exclusive or n
- negate
- invert
- shift left i bits
- shift right i bits
- rotate left i bits
- rotate right i bits -
-		 - Not available. -
Miscellaneous - - -
- :g/pat/p
- :n
- :q
- :rew
- :sh
- :so file
- :ve
- :x
- :! command
- 		- Global search for pattern pat
- Next file to edit
- Exit session without saving the file
- Rewind to first file
- spawn a new shell
- Read and execute a file with colon commands
- Version of the editor
- Exit session, save the file if changed
- execute a system command
-
-
- - -
Currently not available
-		 - - -
-:map
-:unm(ap)
-:ab(breviate)
-:una(bbreviate)
-
-
-

-

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

- -Back to the top - -

-Last update: October 30th 1999 by Gerhard Bürgmann, -Purkersdorf/Austria - - - diff --git a/html/cursor.html b/html/cursor.html deleted file mode 100644 index 7bb90a6..0000000 --- a/html/cursor.html +++ /dev/null @@ -1,117 +0,0 @@ - -BVI: Cursor Movements - - - - - - -
-Command Overview -
Cursor Movements -		 - -BVI -
-
-
-

-

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

- - - - - - - - - - -
CommandBVIVI
Cursor
movements		 - - - - - - - - - - -
h, ARROW_LEFTmove cursor one character to the left
j, +, ^N, ^J, ARROW_DOWN, - RETURN -move cursor down one line
k, -, ARROW_UPmove cursor up one line
l, ARROW_RIGHT, - SPACE -move cursor one character to the right
Hmove cursor to home position, upper left corner of screen
Mmove cursor to the begin of the middle line of the screen
Lmove cursor to the begin of the last line of the screen
-
Move to
begin
and end of
(screen) line		 - - - - -
^move cursor to the first byte of Hex section
$move cursor to the last byte of Ascii section
TABtoggle cursor between the same byte in Hex and Ascii section
-		 - - - - - -
  ^  move cursor to the first nonblank character of line
$move cursor to end of line
0move cursor to the real begin of line
-
Move
by
words		 - - - - - - - - - - - - - -
  w  forward to next string delimited with a nonprinting char
bback to previous string delimited with a nonprinting char
eend of current word
Wforward to next string delimited with a \0 or \n
Bback to previous string delimited with a nonprinting char
Eend of a blank-delimited word
-		 - - - - - - - - - - - - - -
  w  move cursor forward to begin of next word
emove cursor to end of current word
bmove cursor back to begin of current or previous word
Wmove cursor forward to begin of next word, ignoring punctuation
Bmove cursor back to begin of last word, ignoring punctuation
-
-

-

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

- -Back to the top - -

-Last update: October 30th 1999 by Gerhard Bürgmann, -Purkersdorf/Austria - - - diff --git a/html/download.html b/html/download.html deleted file mode 100644 index 6cb6795..0000000 --- a/html/download.html +++ /dev/null @@ -1,98 +0,0 @@ - - -BVI: Download Page - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
 -New in 1.3.2
-New in 1.3.1
-New in 1.3.0
-New in 1.2.0
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Download Page - - -BVI -
-
-
- -

-NOTE: All packages are compressed with the GNU gzip program. You -can download it from ftp://ftp.gnu.org/gnu/gzip/. -

-Current stable release of bvi is 1.3.2 -(Check out what's new): -

-

Sources

- -

Packages

-
- diff --git a/html/edit.html b/html/edit.html deleted file mode 100644 index be34378..0000000 --- a/html/edit.html +++ /dev/null @@ -1,195 +0,0 @@ - -BVI: Edit Commands - - - - - - -
-Command Overview -
Edit Movements -		 - -BVI -
-
-
-

- -

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

-If you would like to use the insert and delete commands, you have to -enable them with the :set memmove option. These commands are -locked per default, because you must not move bytes to a different -address for many types of binary files (e.g. executables, database files, -etc.). If you usually edit files where bytes can be moved, you can add -the :set memmove directive to your .bvirc file. -

- - - - - - - - - - - - - - - - - - - - - -
CommandBVIVI
Replace
bytes		 - - - - - - - - -
  r  replace a single byte, no ESC needed
Rreplace multiple bytes until you type ESC
~toggle between uppercase and lowercase of a byte
- -
Append
bytes		 - - - -
  A  append bytes at end of file
Ddelete bytes to end of file
-		 - - - -
  A  append characters at end of line
Ddelete characters to end of line
-
Insert
bytes		 - - - - - -
  i  insert byte in front of cursor position
ainsert byte after cursor position
-
- - -
  I   insert byte at begin of file
-		 - - -
  I  insert characters at begin of line
-
- - -
not available
-		 - - - -
oinsert new line below current line
Oinsert new line above current line
-
Delete
bytes		 - - - - - - - - - - - - - -
  x  delete byte at of cursor position
Xdelete byte in front of cursor position
dSPACEdelete byte at cursor position
dfCdelete from current position to next character C
d/xyzdelete from current position to first occurance of matching pattern - xyz -
d?xyzdelete from current position to first occurance of matching pattern - xyz in reverse direction -
d'adelete from current position to mark a
dnGdelete from current position to byte with (decimal) address n
-
- - -
not available, because there are no lines, sentences, - paragraphs or sections in a binary file
-		 - - - - - -
dd  delete line
d)delete from cursor position through first - following end of sentence
d}delete from cursor position through first - following end of paragraph
d]delete from cursor position through first - following end of section
-
- - - - - -
d\6a 56 ff  delete from cursor position to first occurance of hex pattern - 6a 56 ff
d#6a 56 ff  delete from cursor position to first occurance of hex pattern - 6a 56 ff in reverse direction
-		 - - -
not available
-
- - - -
Ddelete from current position to EOF
  d$  
-		 - - - -
Ddelete from current position to end of line
  d$  
-
Undo
edits		 - - - -
  u  Undo the most recent change
-
- - -
not available
-		 - - -
  U  Undo all of the changes made to the current line
-
-

-Note that most of the commands can be used with a decimal repeat count in front -of the command! -

-

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

- -Back to the top - -

-Last update: September 30th 1999 by Gerhard Bürgmann, -Purkersdorf/Austria - - - diff --git a/html/german.html b/html/german.html deleted file mode 100644 index 68a69dc..0000000 --- a/html/german.html +++ /dev/null @@ -1,215 +0,0 @@ - - -BVI: Deutsche Beschreibung - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
 -

-
- -		 - - - - -
-Deutsche Beschreibung - - -BVI -
-
-
- -

-Der BVI (Binary-VI) ist ein Editor für Binärfiles. Seine Kommandos sind -weitgehend an den Standard UNIX Editor VI(1) angelehnt. Der Bildschirm -ist in einen hexadezimalen und einen ASCII-Bereich geteilt. Einige zusätzliche -Kommandos wurden zugefügt, einige Kommandos adaptiert und einige Kommandos, -die bei Binärfiles keinen Sinn machen, wurden weggelassen. Für eine -Gesamtübersicht siehe Manual Page BVI(1). - -

Zusätzliche Kommandos

- -Eine wichtige Funktion für binäre Files ist das Suchen nach Hexcodes. -Dafür gibt es analog zum '/' und '?' - Kommando zusätzlich das '\' und -das '#' - Kommando.
- -Beispiel:
-\1e f4 56 - Sucht die angegebene Bytefolge in vorwärts-Richtung
-#34 5a a4 - Sucht Bytefolge rückwärts. -

-Die normalen Textsuchkommandos sind auch vorhanden, wobei zusätzlich ein -Return, Linefeed oder NULL im Suchstring aufscheinen darf (\n \r oder \0). -

-Die Kommandos w, W, b, B (nächstes oder vorhergehendes Wort) wurden insoweit -abgeändert, daß sie eher dem STRINGS(1) - Kommando entsprechen, also in -einem Binärfile Textstrings suchen. Dabei sucht W und B nach Strings, die -mit einem \0 oder \n enden, w und b sucht nach Strings, die mit einem -beliebigen, nicht druckbaren Zeichen enden. Die Stringlänge beträgt 4 Zeichen, -wobei mit ":set wordlength=x" die Stringlänge auf x Zeichen eingestellt werden -kann. -

-Der Bildschirm ist in einen HEX und einen ASCII-Bereich aufgeteilt, wobei -jederzeit mit der TAB - Taste von einem Bereich in den anderen gewechselt -werden kann (auch im Eingabemodus). Es kann also bei der Eingabe zwischen -normalen ASCII-Zeichen und Hex-Eingabe hin- und hergesprungen werden. -

- -Am unteren Bildrand befindet sich eine Statusanzeige, welche die Adresse des -Bytes, auf welchem der Cursor momentan steht, anzeigt. Außerdem wird das Byte -in oktaler, hexadezimaler, dezimaler und ASCII-Repräsentation anzeigt. Die -ASCII-Anzeige kann von DOS-Style (27 entspricht ^Z) auf UNIX-Style entsprechend -Manual Page ASCII(7) umgeschaltet werden (27 entspricht SUB). -Kommando ist ":set unixstyle". Die Statusanzeige kann mit ":set noshowmode" -ausgeschaltet werden. - -

Regular Expressions

- -Für die Suchkommandos sowohl für Text als auch Hex sind Regular Expressions -zulässig, wobei es die Zeichen ^ und $ für Zeilenanfang und Zeilenende nicht -gibt. Die Kombination .* ist unzulässig, da sie sich auf jeden Fall auf das -Ende des Files beziehen würde. - -

Zeilen

- -Da es in binären Files keine Zeilen gibt (die Darstellung der einzelnen -Zeilen am Bildschirm hat keinen Bezug zum File) gibt es keinerlei -zeilenorientierte Kommandos (dd, o, O, yy). Ein Kommando -wie :s/XXX/UUU/g ändert somit das gesamte File. Zu beachten ist auch, daß -:s/XX/UUUU/ nicht die beiden X durch vier U ersetzt, sondern die beiden den -X folgenden Zeichen auch durch U überschrieben werden. - -

Editierkommandos

- -Da binäre Files häufig ausführbare Programme oder Datenbankfiles sind, -bei denen Bytes nicht einfach an eine andere Adresse verschoben werden -dürfen, sind Einfüge- und Löschkommandos (z.B. a, i, x) -deaktiviert. Mit dem Kommando :set memmove können sie -aktiviert werden. -

-Die Kommandos :a (append), :c (change) und :i (insert) -können benutzt werden, um ein oder mehrere Bytes in ASCII, binärer, -dezimaler, hexadezimaler oder oktaler Schreibweise einzugeben -(a, b, d, h oder o). Es -können mehrere (Bildschirm) Zeilen eingegeben werden. Das Kommando -wird beendet, sobald eine Zeile, die nur aus einem Punkt besteht, -eingegeben wird. -

-Beispiel: -

-
-:i b
-1 1001 010101 1111
-11111 1010 1 0 1
-.
-
-
-Zu beachten ist, daß kein Einzelwert den maximalen Byte-Wert (255) -überschreiten darf, da sonst die Eingabe abgebrochen wird. Das -Drücken der RETURN - Taste führt zu keinem "RETURN" - Zeichen in -der Datei, im ASCII - Modus können allerdings die Sonderzeichen -\n, \r, \t und \0 benutzt werden. - -

Yank und Put

- -Auch hier gilt eine etwas geänderte Funktion. Das y (yank) - -Kommando ist allerdings ab Version 1.2.0 dem Vi angenähert:
- - - - - -
5ySPACEkopiert 5 Zeichen in den Yank-Buffer
oüberschreibt an Cursor - Position die folgenden Zeichen -mit dem Inhalt des Yank- oder Delete - Puffers
pfügt an der Cursor - Position den Inhalt des Yank- -oder Delete - Puffers ein.
Pfügt den Inhalt des Yank- oder Delete - Puffers am Dateiendes -an.
-

-Das Kommando ":r filename" fügt das angegebene File nicht an der Cursor- -Position sondern am Dateiende an. - -

Adressen

- -Das Kommando nG führt nicht zur n. Zeile, sondern zum n. Byte. -Die Eingabe der Nummer wird dezimal interpretiert. Um eine Adresse -hexdezimal angeben zu können, kann g eingegeben werden. Es erscheint ein -Prompt in der Statuszeile, bei dem eine hexadezimale Eingabe erfolgen kann. -Das erste Byte hat Adresse 0.
-Die Anzeige der Adressen kann mit einem Offset versehen werden -(:set offset=256), beispielsweise um für .COM Files in DOS einen Beginn -bei Adresse 100Hex anzuzeigen. Wird ein offset=1 angegeben, so ist -hat das erste Byte Adresse 1. Das G - Kommando berücksichtigt den Offset. -Im Gegensatz dazu zeigt das :f - Kommando immer die Ordnungszahl des -Bytes an, beginnend mit 1 ohne Berücksichtigung des Offsets. - -

Bitweise Kommandos

- -Um Manipulationen auf Bit-Ebene durchführen zu können, stehen -folgende Kommandos zur Verfügung: -
- - - - - - - - - -
:rl nRotiert Bits links - n ist eine Zahl zwischen 1 und 7
:rr nRotiert Bits rechts
:sl nSchiebt Bits links
:sr nSchiebt Bits rechts
:and iUnd Verknüpfung - i ist eine Zahl zwischen 0 und 255
:or iOder Verknüpfung
:xor iExklusiv-oder Verknüpfung
:not Negiert Bytewert
:neg Zweier-Komplement
-Wird kein Bereich angegeben, so bezieht sich die Operation auf die gesamte -Datei. Es können zwei Adressen in den üblichen Schreibweisen -angegeben werden. Normalerweise wird dezimale Eingabe erwartet, bei -führender 0 werden die Adressen Hexadezimal interpretiert. -
Der Wert i für die logische Verknüpfung kann -dezimal, hexadezimal, oder mit führendem B in binärer -Schreibweise angegeben werden. Auch bei Eingabe von genau acht 0 und 1 -Werten wird der Byte - Wert binär interpretiert.
-Beispiel:
-
-:100,500and 01A RETURN
-:03FA,01000or 00001000 RETURN
-:.rr 3 RETURN
-:'a,$sl 1 RETURN
-
-

- -Back to the top - -

-Last update: June 1st 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/gif/.xvpics/bg2.gif b/html/gif/.xvpics/bg2.gif deleted file mode 100644 index 94f1144..0000000 --- a/html/gif/.xvpics/bg2.gif +++ /dev/null @@ -1,5 +0,0 @@ -P7 332 -#IMGINFO:1600x1 Indexed (91 bytes) -#END_OF_COMMENTS -80 1 255 -I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%Û¶Ú¶%HII·Ú¶¶%HIIÛ¶¶¶I$IIÛ¶¶Û$I$IÛ¶Ú·$IH%Û¶Ú·$IHI·Ú¶·H%HIÛ¶¶· \ No newline at end of file diff --git a/html/gif/bg2.gif b/html/gif/bg2.gif deleted file mode 100644 index 4a4166f..0000000 Binary files a/html/gif/bg2.gif and /dev/null differ diff --git a/html/gif/bvi_m.gif b/html/gif/bvi_m.gif deleted file mode 100644 index bb92a67..0000000 Binary files a/html/gif/bvi_m.gif and /dev/null differ diff --git a/html/gif/bvi_s.gif b/html/gif/bvi_s.gif deleted file mode 100644 index 8a4cec0..0000000 Binary files a/html/gif/bvi_s.gif and /dev/null differ diff --git a/html/gif/dcbacks.gif b/html/gif/dcbacks.gif deleted file mode 100644 index 34c01a7..0000000 Binary files a/html/gif/dcbacks.gif and /dev/null differ diff --git a/html/gif/dot.gif b/html/gif/dot.gif deleted file mode 100644 index 1d9a4f5..0000000 Binary files a/html/gif/dot.gif and /dev/null differ diff --git a/html/gif/up.gif b/html/gif/up.gif deleted file mode 100644 index 5dabaee..0000000 Binary files a/html/gif/up.gif and /dev/null differ diff --git a/html/index.html b/html/index.html deleted file mode 100644 index 788e530..0000000 --- a/html/index.html +++ /dev/null @@ -1,130 +0,0 @@ - - -BVI - Binary VIsual editor - - - - - - - - - - - - -
- -
- -

-Quick Tutorial -

- -

-Download -

- -

-Installation -

- -

-Command Overview -

- -

-bmore -

- -

-Deutsche
Beschreibung -

- -

-Sitemap -

- -

-Project Page -

- -
- -

-VI and Clones -

- -

-Hex-Editors -

- -
- -

- -SourceForge Logo -

- -		 -
-

Welcome to the
-bvi
-Homepage

-Here you can find all the informations about bvi you need. -
-
-The bvi is a display-oriented editor for binary files, based on the vi texteditor. -If you are familiar with vi, just start the editor and begin -to edit! A bmore programm is also included in the package. -
-If you never heard about vi, maybe bvi is not the best -choice for you. - -

-

Current: Version 1.3.2

- -You can download source and compiled versions from the -download page.
-Check out whats new in 1.3.2! - -

-Newsgroup: comp.editors - -

-Mailing List (very low traffic): -

-To join this list, simply send a blank email to -bvi-subscribe@yahoogroups.com. -You will receive a subscription confirmation message. -Simply reply this message and your subscription will be complete. -
- -Bvi was developed by Gerhard Bürgmann and is published -under the GNU Public License. Current stable version is 1.3.2. -Bvi is running on most UNIX - like operating systems and -on MSDOS. -

-If you want to contact me:
-Gerhard Bürgmann, Vienna ( Purkersdorf ) / Austria / Europe
-E-mail: gerhard@puon.at
-Have a look at Meta Chrom Kennzeichenhalter - -

- - -Back to the top - -

-Last update: January 8th 2004 by Gerhard Bürgmann -

-
- - diff --git a/html/install.html b/html/install.html deleted file mode 100644 index 82870e8..0000000 --- a/html/install.html +++ /dev/null @@ -1,139 +0,0 @@ - - -BVI: Installation - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-

-

-Installation
 -

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Installation - - -BVI -
-
-
- -

-The following steps are necessary to get bvi running: -

UNIX

-The Unix version of bvi needs the curses (ncurses) library -for cursor movement. -
    -
  1. Download the source package from the Download Page
    2. -
  2. Unzip the package with the command:
    3. -
    -    # gunzip -c bvi-1.3.2.src.tar.gz | tar xvf
-
    -
  3. Change to the directory bvi-1.3.2 and type -
    -    # ./configure
-    # make
-
    4. - -
  4. Type `make install' for copying the executable files -and manual pages to the final directories. -
    -By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. -You can specify an -installation prefix other than `/usr/local' by giving -`configure' the option -`--prefix=PATH'. Use the -`--with-ncurses' option to configure to specify an -alternate search path for Ncurses outside the normal -include/lib search path. -

    -You will find now four new commands: -

    -    bvi     The binary editor
-    bview   The readonly version of bvi
-    bedit   The beginners version of bvi
-    bmore   The binary more program
-
    5. -
  5. Use `make uninstall' to remove the installed -files from your file system.
    -You can remove the program binaries and object files from the -source code directory by typing `make clean'. -To also remove the files that `configure' created -(so you can compile the package for -a different kind of computer), type `make distclean'.
    6. -
- -

MSDOS

-Beginning with version 1.3.2 you may use the DJGPP environment to -compile bvi for working under both Win32 and DOS. -

-The MSDOS version (Borland C) exists for historical reasons and is not -supported anymore: -

-

-You have to convert the sourcefiles from the UNIX textformat to -the MSDOS textformat first. This can be done e.g. by loading and -saving them with the MSDOS standard editor `edit'. -

-The MSDOS version is using the conio routines of the -Borland - C compilers for cursor movement. The doscur.h -header file substitutes the curses commands.
-Bvi is using the "HUGE" memory model, bmore -needs the "TINY" model to -be able to convert it to a .COM file. - -

    -
  1. Download the source package from the Download Page
    2. -
  2. Unzip the package with the command: -
    -    gunzip -c bvi-1.3.2.src.tar.gz | tar xvf
-
    3. -
  3. Load the tcconfig file (located in the bc subdirectory -for Borland - C).
    4. - -
  4. Press F9-Make
    5. -
-
-

- -Back to the top - -

-Last update: February 12th 2004 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/man_bmore.html b/html/man_bmore.html deleted file mode 100644 index 921c0c1..0000000 --- a/html/man_bmore.html +++ /dev/null @@ -1,181 +0,0 @@ - - -BMORE(1) BMORE(1) - - -NAME - bmore - browse through a binary file - -SYNOPSIS - bmore [ -acdi ] [ -n lines ] [ -w cols ] [ +linenumber ] [ - +/ASCII-pattern ] [ +\Hex-pattern ] [ filename ... ] - - -DESCRIPTION - more is a filter that displays the contents of a binary - file on the terminal, one screenful at a time. It nor- - mally pauses after each screenful, and prints --More-- at - the bottom of the screen. bmore provides a two-line over- - lap between screens for continuity. If bmore is reading - from a file rather than a pipe, the percentage of charac- - ters displayed so far is also shown. - - bmore scrolls up to display one more screen line in - response to a RETURN character; it displays another - screenful in response to a SPACE character. Other com- - mands are listed below. - - The screen is divided in three sections or panes: The byte - offset (extreme left), the hex pane (middle), and an ascii - pane (right) which shows as printable characters those - bytes in the hex pane. On an 80 column terminal there - will be sixteen hex values and their ASCII values on each - screen line. Note that (as one would expect) the first - byte has the offset 0 (zero). - - bmore sets the terminal to noecho mode, so that the output - can be continuous. Commands that you type do not normally - show up on your terminal, except for the / , \ and ! com- - mands. - - If the standard output is not a terminal, more acts just - like cat(1V), except that a header is printed before each - file in a series. - -OPTIONS - -a ASCII mode: no hex representation of the contents. - Non printable characters are displayed as a dot (.) - - -c Clear before displaying. Redrawing the screen - instead of scrolling. - - -d Display error messages rather than ringing the ter- - minal bell if an unrecognized command is used. - This is helpful for inexperienced users. - - -i Ignore case for searching. - - -n lines - Displays the indicated number of lines in each - screenful, rather than the default (the number of - lines in the terminal screen less two). - - -w cols - Display number of cols in each line. - - +linenumber - Start up at linenumber. - - +/ASCII-pattern - Start up at the line containing the regular expres- - sion pattern. Note: unlike editors, this construct - should not end with a `/'. If it does, then the - trailing slash is taken as a character in the - search pattern. - - -USAGE - - Commands - The commands take effect immediately; it is not necessary - to type a carriage return. Up to the time when the com- - mand character itself is given, the user may type the line - kill character to cancel the numerical argument being - formed. In addition, the user may type the erase charac- - ter to redisplay the `--More--(xx%)' message. - - In the following commands, i is a numerical argument (1 by - default). - - iSPACE Display another screenful, or i more lines if i - is specified. - - iRETURN Display another line, or i more lines, if speci- - fied. - - i^D (CTRL-D) Display (scroll down) 11 more lines. i - is given, the scroll size is set to i. - - id Same as ^D. - - iz Same as SPACE, except that i, if present, - becomes the new default number of lines per - screenful. - - is Skip i lines and then print a screenful. - - if Skip i screenfuls and then print a screenful. - - i^B (CTRL-B) Skip back i screenfuls and then print a - screenful. - - b Same as ^B (CTRL-D). - - q - Q Exit from more. - - = Display the current line number. - - v Drop into the bvi(1) editor at the current off- - set of the current file. - w Drop into the bvi(1) editor at the current off- - set of the current file. Only the portion of the - file displayed on the screen will be loaded. - - h Help. Give a description of all the more com- - mands. - - i/pattern Search for the ith occurrence of the regular - expression pattern. Display the screenful - starting at the file position that contains the - ith match for the regular expression ASCII-pat- - tern, or the end of a pipe, whichever comes - first. If bmore is displaying a file and there - is no such match, its position in the file - remains unchanged. Regular expressions can be - edited using erase and kill characters. Erasing - back past the first column cancels the search - command. - - ' Single quote. Go to the point from which the - last search started. If no search has been per- - formed in the current file, go to the beginning - of the file. - - !command Invoke a shell to execute command. The charac- - ters % and !, when used within command are - replaced with the current filename and the pre- - vious shell command, respectively. If there is - no current filename, % is not expanded. Prepend - a backslash to these characters to escape expan- - sion. - - i:n Skip to the ith next filename given in the com- - mand line, or to the last filename in the list - if i is out of range. - - i:p Skip to the ith previous filename given in the - command line, or to the first filename if i is - out of range. If given while more is positioned - within a file, go to the beginning of the file. - If more is reading from a pipe, more simply - rings the terminal bell. - - :f Display the current filename and offset number. - - :q - :Q Exit from bmore (same as q or Q ). - - . Dot. Repeat the previous command. - - - FILES - /etc/termcap terminal data base - /usr/local/share/bmore.help - help file - -SEE ALSO - bvi(1), termcap(5) - - 3 Jan 2004 - diff --git a/html/man_bvi.html b/html/man_bvi.html deleted file mode 100644 index e6763c6..0000000 --- a/html/man_bvi.html +++ /dev/null @@ -1,426 +0,0 @@ - -BVI(1) User Commands BVI(1) - - -NAME - bvi, bview - visual editor for binary files - -VERSION - bvi-1.3.2 - -SYNOPSIS - bvi [-R] [-c cmd] [-f script] [-b begin] [-e end] [-s size] file... - bview [-R] [-c cmd] [-f script] [-b begin] [-e end] [-s size] file... - -OPTIONS - file... - A list of filenames. The first one will be the - current file and will be read into the buffer. The - cursor will be positioned on the first line of the - buffer. You can get to the other files with the - ":next" command. - - -R "Readonly": The readonly flag is set for all the - files, preventing accidental overwriting with a write - command. - - - -b begin - causes bvi to load a file not from the start but from - offset begin. - - - -e end - causes bvi to load a file not till end but till - address end. - - - -s size - causes bvi not to load the complete file but only size - bytes. - - - -c cmd - cmd will be executed after the first file has - been read. If the cmd contains spaces it must be - enclosed in double quotes (this depends on the shell - that is used). - - -f script - This command provides a means for collecting a series - of "ex" (colon) commands into a script file, then - using this file to edit other files. Since there is no - binary stream editor "bsed", you can use this option - to make several global changes in a binary file. - -DESCRIPTION - Bvi stands for "Binary VIsual editor". Bvi is a screen - oriented editor for binary files; its command set is based - on that of the vi(1) text editor. As a binary editor does - not have the concept of "lines" there are differences from - Vi commands wherever the latter are line orientate. - -COMPARISON - The main differences between Vi and Bvi are: - - The screen is divided in three sections or panes: The byte - offset (extreme left), the hex pane (middle), and an ascii - pane (right) which shows as printable characters those - bytes in the hex pane. On an 80 column terminal there - will be sixteen hex values and their ASCII values on each - screen line. Note that (as one would expect) the first - byte has the offset '0' (zero). - - You can toggle between the hex and ascii windows with the - tab key (TAB). Toggling between these two windows does - not change the current position (offset) within the file. - - No "lines" concept: Files are treated as one long stream - of bytes. The characters "newline" and "carriage return" - are not special, id est they never mark the end of lines. - Therefore the lines on the screen do not represent lines - in the usual way. Data is broken across screen lines - arbitarily. As a consequence there are no commands in bvi - from ex or vi that are based on line numbers, eg "dd", - "yy", 'C', 'S', 'o', 'O'. This also changes the meaning - of "range" before the ":write" command to a byte offset, - ie the command ":100,200w foo" writes all *bytes* (not - lines) from offset 100 to offset 200 to the file "foo". - - No "text objects": There are also no text-specific - arrangements like words, paragraphs, sentences, sections - and so on. - - Extended "ruler": The bottom line of the screen shows the - current address (byte offset) and the current character in - these notations: - - octal, hexadecimal, decimal and ascii. - - Search patterns: All search commands understand these - special characters: - - . any character - [] set of characters - * zero or more occurrences of previous char or set - - But as there is no concept of lines you cannot use the - standard symbols ("anchors") for "begin-of-line" ('^') and - "end-of-line" ('$'). Searching for the start/end of lines - must be done explicitly by adding these special characters - to your search pattern using these meta sequences: - - \n newline - \r return - \t tab - \0 binary zero - - Additional search commands: Similar to the text search - commands there are additional hex-search functions '\' and - '#' which allow to search for any byte value. Example: - "\62 76 69" will search for the string "bvi". Spaces - between hex value are optional, so searching for - "6775636B6573" will find "guckes". - - Changing the length of data (insertion, deletion) moves - the data to other addresses; this is bad for many cases - (eg. databases, program files) and is thus disabled by - default. You can enable this commands by typing - - :set memmove - - BVI Modes: - - Command Mode (Normal Mode): - - Input is treated as command. Note that command mode is - the default mode after startup and after escaping from - input mode. Use ESC (escape) to cancel a partial - (uncompleted) command. - - Input Mode: - - Input is treated as replacement of current characters or - (after the end of the file) is appended to the current - file. This mode is entered from command mode by typing - one of 'i', 'I', 'A', 'r', or 'R'. You can enter the - characters from the keyboard (in the ASCII window) or - hexadecimal values (in the HEX window). Type TAB to - switch between these two windows. Type ESC to finish the - current input and return to command mode. Type CTRL-C to - cancel current command abnormally. - - Command line mode (Last Line Mode or : mode): - - Similar to vi, this mode is entered by typing one of the - characters : / ? \ # ! The command is terminated and - executed by typing a carriage return; to cancel a - partially typed command, type ESC to cancel the current - command and return to command mode. - -ENVIRONMENT - The editor recognizes the environment variable BVIINIT as - a command (or list of commands) to run when it starts - up. If this variable is undefined, the editor checks for - startup commands in the file ~/.bvirc file, which you - must own. However, if there is a .bvirc owned by you in - the current directory, the editor takes its startup - commands from this file - overriding both the file in your - home directory and the environment variable. - -TERMINOLOGY - Characters names are abbreviated as follows: - Abbr. ASCII name aka - CR 010 carriage return - ^A 001 control-a - ^H 008 control-h - ^I 009 control-i aka TAB - ^U 021 control-u - ^Z 026 control-z - ESC 027 escape aka ESC - DEL 127 delete - LEFT --- left arrow - RIGHT --- right arrow - DOWN --- down arrow - UP --- up arrow - -COMMAND SUMMARY - See the TERMINOLOGY for a summary on key name - abbreviations used within the following description of - commands. - - Abstract: - Arrow keys move the cursor on the screen within the - current window. - - Sample commands: - :version show version info - <- v ^ -> arrow keys move the cursor - h j k l same as arrow keys - u undo previous change - ZZ exit bvi, saving changes - :q! quit, discarding changes - /text search for text - ^U ^D scroll up or down - - Counts before bvi commands: - Numbers may be typed as a prefix to some commands. - They are interpreted in one of these ways. - - screen column | - byte of file G - scroll amount ^D ^U - repeat effect most of the rest - - Interrupting, canceling - ESC end insert or incomplete command - DEL (delete or rubout) interrupts - - File manipulation: - ZZ if file modified, write and exit; - otherwise, exit - :w write changed buffer to file - :w! write changed buffer to file, overriding - read-only ("forced" write) - :q quit when no changes have been made - :q! quit and discard all changes - :e file edit file - :e! re-read current file, discard all changes - :e # edit the alternate file - :e! # edit the alternate file, discard changes - :w file write current buffer to file - :w! file write current buffer to file overriding - read-only (this "overwrites" the file) - :sh run the command as set with option "shell", - then return - :!cmd run the command cmd from "shell", then - return - :n edit next file in the argument list - :f show current filename, modified flag, - current byte offset, and percentage of - current position within buffer - ^G same as :f - - Additional edit commands - You can insert/append/change bytes in - ASCII/binary/decimal/ hexadecimal or octal representation. - You can enter several (screen) lines of input. A line with - only a period (.) in it will terminate the command. You - must not type in values greater than a byte value. This - causes an abandonment of the command. Pressing the CR key - does not insert a newline - character into the file. If - you use ASCII mode you can use the special characters \n, - \r, \t and \0. - - :i aCR insert bytes (ASCII) at cursor position - :a bCR append bytes (Binary) at end of file - :c hCR change bytes (hexadecimal) at cursor position - - Bit-level operations - :and n bitwise 'and' operation with value n - :or n bitwise 'or' operation with value n - :xor n bitwise 'xor' operation with value n - :neg two's complement - :not logical negation - :sl i shift each byte i bits to the left - :sr i shift each byte i bits to the right - :rl i rotate each byte i bits to the left - :rr i rotate each byte i bits to the right - - Command mode addresses - :w foo write current buffer to a file - named "foo" - :5,10w foo copy byte 5 through 100 into as - file named foo - :.,.+20w foo copy the current byte and the next - 20 bytes to foo - :^,'aw foo write all bytes from the beginning - through marker 'a' - :/pat/,$ foo search pattern pat and and copy - through end of file - - Positioning within file: - ^B backward screen - ^F forward screen - ^D scroll down half screen - ^U scroll up half screen - nG go to the specified character - (end default), where n is a decimal address - /pat next line matching pat - ?pat previous line matching pat - \hex jump to next occurrence of hex string hex - #hex jump to previous occurrence of hex string hex - n repeat last search command - N repeat last search command, but in opposite - direction - - Adjusting the screen: - ^L clear and redraw screen - zCR redraw screen with current line at top of screen - z- redraw screen with current line at bottom of - screen - z. redraw screen with current line at center of - screen - /pat/z- search for pattern pat and then move currents - line to bottom - ^E scroll screen down 1 line - ^Y scroll screen up 1 line - - Marking and returning: - mx mark current position with lower-case letter x - Note: this command works for all lower-case - letters - 'x move cursor to mark x in ASCII section - `x move cursor to mark x in HEX section - '' move cursor to previous context in ASCII section - `` move cursor to previous context in HEX section - Line positioning: - H jump to first line on screen ("top") - L jump to last line on screen ("low") - M jump to middle line on screen ("middle") - - jump onto previous line on screen - + jump onto next line on screen - CR same as + - DOWN or j next line, same column - UP or k previous line, same column - - Character positioning: - ^ first byte in HEX window - $ end of screen line - l or RIGHT jump onto next byte (within current - screen line) - h or LEFT jump onto previous byte (within current - screen line) - ^H same as LEFT - space same as RIGHT - fx find next occurrence of character x - Fx find previous occurrence of character x - n| jump onto nth byte/character within current - line - - Strings: - (works similar to the strings(1) command) - Note: "Words" are defined as strings of "nonprinting - characters". - e jump to next end of word - w jump to next begin of word - b jump to previous begin of word - W forward to next string delimited with a - \0 or \n - B back to previous string delimited with a - nonprinting char - Corrections during insert: - ^H erase last character (backspace) - erase your erase character, same as ^H (backspace) - ESC ends insertion, back to command mode - - Append and replace: - A append at end of file - rx replace current bte with char 'x' - R enter replace mode; for all subsequent input, - the current byte is overwritten with the next - input character; leave replace mode with ESC. - - Miscellaneous Operations: - TAB toggle between ASCII and HEX section - - Yank and Put: - 3ySPACE yank 3 characters - p insert contents of yank buffer - o replace text with content of yank buffer - P put back at end of file - - Undo, Redo: - u undo last change - Note: Only the last change can be undone. - Therefore this commands toggles between the - last and second-t-last state of the buffer. - - Setting Options: - With the :set command you can set options in bvi - - Option Default Description - - autowrite noaw Save current file, if modified, if you - give a :n, :r or ! command - columns cm=16 on an 80 character wide terminal - ignorecase noic Ignores letter case in searching - magic nomagic Makes . [ * special in patterns - memmove nomm enables insert and delete commands - offset of=0 adds an offset to the diplayed addresses - readonly noro If set, write fails unless you use ! after command - scroll sc=1/2 window - Number of lines scrolled by ^U and ^D - showmode mo Displays statusline on bottom of the screen - terse noterse Let you obtain shorter error messages - window window=screensize - Lines in window, can be reduced at slow terminals - wordlength wl=4 Length of an ASCII-string found by w, W, b or B - wrapscan ws Searches wrap around past the end of the file - unixstyle nous The representation of ascii characters below - 32 is displayed in the statusline as shown - in ascii(7) if unset rather in DOS-style (^A) - - -AUTHOR - bvi was developed by Gerhard Buergmann, Vienna, Austria - Gerhard.Buergmann@puon.at - -WWW - Bvi Homepage: http://bvi.sourceforge.net/ - Vi Pages: http://www.guckes.net/vi/clones.php3 - (all about Vi and its clones) - -FILES - $HOME/.bvirc editor startup file - ./.bvirc editor startup file - -BUGS - Bvi does not update the screen when the terminal changes - its size. - -SEE ALSO - vi(1), strings(1), ascii(5) - -3/Jan/2004 BVI Version 1.3.2 - diff --git a/html/new120.html b/html/new120.html deleted file mode 100644 index a26527c..0000000 --- a/html/new120.html +++ /dev/null @@ -1,157 +0,0 @@ - - -BVI: CHANGES in bvi 1.2.0 - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-New in 1.3.2
-New in 1.3.1
-New in 1.3.0
-New in 1.2.0
 -

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-CHANGES in bvi 1.2.0 - - -BVI -
-
-
- -

-

    -
  • Configuration with GNU autoconfig -
  • New :set options: -
      -
    • :set columns=n
      - You can set the number of columns on the screen to an - arbitrary value. This might be useful if you edit a file - with a fixed record length.
      - Default: max number of columns, divisible by four.
      - Abbreviation: :set cm=n -
    • :set memmove - enables the new commands to insert or delete bytes.
      - Per default this commands are disabled, because e.g. in - executable files you must not move bytes.
      - Default: :set nomemmove
      - Abbreviation: :set mm - :set nomm -
    • The listing for :set all is now in - alphabetical order. -
    -
  • New insert and delete commands: -
      -
    • a inserts after cursor position -
    • i inserts on cursor position -
    • x deletes byte under cursor -
    • X deletes byte before cursor -
    • d delete command with modifiers: -
        -
      • dSPACE deletes byte under cursor -
      • dfC deletes from current position to - next character C -
      • d/xyz deletes from current position - to first matching pattern xyz -
      • d$ deletes from current position to EOF -
      • d'a deletes from current positions - to mark a -
      • dnG deletes from current position to - byte with (decimal) address n -
      -
    -
  • New syntax for p (put) command:
    - In previous versions of bvi the p command did an overwriting - "put". Now the bytes are inserted. -
  • New command o (overwrite):
    - This is an overwriting "put" command. It is the only command in bvi - that uses a command key in a complete different way than in vi - (o opens a new line in vi). -
  • New syntax for y (yank) command: -
      -
    • ySPACE yanks byte under cursor -
    • yfC yanks from current position to next - character C -
    • y/xyz yanks from current position to - first matching pattern xyz -
    • y$ yanks from current position to EOF -
    • y'a yanks from current position to - mark a -
    • ynG yanks from current position to - byte with (decimal) address n -
    -
  • New ex (colon) commands: -
      -
    • :a(ppend) a(scii)|b(binary)|d(ecimal)|h(exadecimal)|o(ctal) -
    • :c(hange) a(scii)|b(binary)|d(ecimal)|h(exadecimal)|o(ctal) -
    • :i(nsert) a(scii)|b(binary)|d(ecimal)|h(exadecimal)|o(ctal)
      - The three commands above are used to append or change or insert bytes - in the selected representation until you type a line containing only - a dot, e.g. insert bytes in binary mode: - 
      -	:i b
-	0 010 110 1110010 10 100
-	1 1001 1001 0 0
-	.
-
      - Pressing the RETURN key does not insert - a newline - character into the file. If you use :i a (insert - ascii) you can use the special characters \n, \r, \t and \0. -
    • :d(elete) -
    • :g(lobal) does a global search with printing found items -
    • :ma(rk) -
    • :pu(t) puts yanked bytes into the file -
    • :o(verwrite) is an overwriting ":put" -
    • :y(ank) -
    -
  • :f newname - bug fixed -
  • new command line option -f script -
  • CTRL - C aborts some commands, e.g. search commands -
  • CR moves cursor to 1st column of next screen line -
  • Local settings according to the environment variable LANG -will be evaluated (see setlocal(3)). -
-

- -Back to the top - -

-Last update: June, 1st 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/new130.html b/html/new130.html deleted file mode 100644 index 304272e..0000000 --- a/html/new130.html +++ /dev/null @@ -1,104 +0,0 @@ - - -BVI: CHANGES in bvi 1.3.0 - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-New in 1.3.2
-New in 1.3.1
-New in 1.3.0
 -New in 1.2.0
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-CHANGES in bvi 1.3.0 - - -BVI -
-
-
- -

-

    -
  • In the configure script you can use --with-ncurses -option to configure to specify an alternate -search path for Ncurses outside the normal include/lib search path. -

    -

  • A make uninstall option has been added -

    -

  • A bmore program has been added. It acts like the BSD - text - more, -but for binary files.

    -Additional command line options: -

    --a   ASCII mode -
    -Additional (changed) Commands: -
    -v   does not invoke vi but bvi
    -w   invokes bvi with only that portion of the file -which is displayed on the screen. -
    -
  • New in bvi: -
      -
    • You can edit now Block Special Files too. -
    • You can read - edit - write files partly. -
    • New Command line options: -
      - +cmd
      - -b begin \
      - -e end    > for partial file read
      - -s size  /

      -

      - begin, end or size can be an integer value (decimal or - hexadecimal) or an integer value with an appended k (for - multiply by 1024) or m (for multiply by 1.048.576). -
    • :e# bug fixed -
    • Debian bug #68436 (Buffer overflow in io.c) fixed -
    -
-

- -Back to the top - -

-Last update: October 12th 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/new131.html b/html/new131.html deleted file mode 100644 index 020f791..0000000 --- a/html/new131.html +++ /dev/null @@ -1,98 +0,0 @@ - - -BVI: CHANGES in bvi 1.3.1 - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-New in 1.3.2
-New in 1.3.1
 -New in 1.3.0
-New in 1.2.0
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-CHANGES in bvi 1.3.1 - - -BVI -
-
-
- -

-This is a bugfix release. -

-BVI: -

    -
  • autoconf 2.52 used -

    -

  • do_back() fixed (cast)
    • -

    -

  • replace sys_errlist[errno] with strerror(errno) (Debian #106762)
    • -

    -

  • fix: one can continue deleting bytes even when file is empty (Debian #121934)
    • -

    -

  • wish: no ":set mm" to delete bytes from end of file (Debian #122240)
    • -

    -

  • cast for alloc_buf() in set.c
    • -

    -

  • r-bug fix in edit.c and bvi.c
    • -

    -

  • renamed CTRL to BVICTRL (AIX problem)
    • -

    -

- -BMORE: -
    -
  • nicer last line
    • -

    -

  • bmbeep() instead of beep() (SOLARIS problem)
    • -

    -

  • subshell support fixes
    • -
- -

- -Back to the top - -

-Last update: February 12th 2002 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/new132.html b/html/new132.html deleted file mode 100644 index e195a76..0000000 --- a/html/new132.html +++ /dev/null @@ -1,93 +0,0 @@ - - -BVI: CHANGES in bvi 1.3.2 - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-New in 1.3.2
 -New in 1.3.1
-New in 1.3.0
-New in 1.2.0
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-CHANGES in bvi 1.3.2 - - -BVI -
-
-
- -

-This is a bugfix release. -

-BVI: -

    -
  • ported to compile under DJGPP v2.0 w/ PDCURSES (by simoN)
    • -

    -

  • some minor fixes
    • -

    -

-


-BMORE: -
    -
  • configure: checking term.h and ncurses/term.h
    • -

    -

  • cast in bmore.c in putline();
    • -

    -

  • fixed multiple file handling for "bmore" (by simoN)
    • -

    -

  • renamed several local screen processing routines to avoid compiler conflicts
    • -

    -

  • several minor fixes to "bmore" code (by simoN)
    • -

    -

  • reset tty after CTRL-C in bmore
    • -
-


- -

- -Back to the top - -

-Last update: January 8th 2004 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/overview.html b/html/overview.html deleted file mode 100644 index c03bf6c..0000000 --- a/html/overview.html +++ /dev/null @@ -1,97 +0,0 @@ - - -BVI: Command Overview - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-

-

-Installation
-

-

-Command Overview
 -Cursor Movement
-Edit Cmds
-Yank and Put Cmds
-Set Options
-Colon (ex) Cmds
-man - Page
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Command Overview - - -BVI -
-
-
- -

-This overview compares bvi commands with the corresponding commands of -the standard ascii vi. -

-

- - - - -
Commands shown in blue frames are commands which -are available in both bvi and vi, but with a slightly different -behavior.
Green frames are used for commands which are -equal in both bvi and vi.
Red frames are used for missing commands
-
-

-Special keys are displayed in a gray font, e.g. -RETURN, -ARROW_UP or -CTRL. - -

Topics:

-

-

-

- -Back to the top - -

-Last update: June 1st 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/qt_bit.html b/html/qt_bit.html deleted file mode 100644 index 3cc9cd4..0000000 --- a/html/qt_bit.html +++ /dev/null @@ -1,102 +0,0 @@ - - -BVI: Bit-wise Operations - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-Editing Files
-Search Commands
-Bit-wise Operations
 -Find and Replace
-Yank and Put
-Settings
-Partial File Read
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Quick Tutorial -
Bit-wise Operations -		 - -BVI -
-
-
- -

-To perform logical operations, bvi has a set of bit-level commands. -The following commands are available: -

- - - - - - - - - -
:rl nrotate left - n is a number from 1 through 7
:rr nrotate right
:sr nshift right
:sl nshift left
:and iand operation - i is a number from 0 through 255
:or ior operation
:xor ior operation
:not negates operation
:neg negates operation
-

-The i value can be entered as a decimal number (0 - 255), -a hexadecimal number with a leading zero (0 - 0ff) or a binary number, -either with a leading B (B101) or exactly eight digits long (00000101). -

-On default the whole file is affected, but you can use the usual -colon command address forms. In contrast to vi the addresses designate -not line numbers but byte numbers. These addresses can be enterd in -decimal or hexadecimal notation.
-Examples: -

-:100,500and 01A RETURN
-:03FA,01000or 00001000 RETURN
-:.rr 3 RETURN
-:'a,$sl 1 RETURN
-
-

- -Back to the top - -

-Last update: Thu Jun 01 12:00:00 CEST 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/qt_edit.html b/html/qt_edit.html deleted file mode 100644 index a389c8c..0000000 --- a/html/qt_edit.html +++ /dev/null @@ -1,131 +0,0 @@ - - -BVI: Editing Files - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-Editing Files
 -Search Commands
-Bit-wise Operations
-Find and Replace
-Yank and Put
-Settings
-Partial File Read
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Quick tutorial -
Editing Files -		 - -BVI -
-
-
- -

-Inserting or deleting bytes can be dangerous on some kind of files, -because binary files are mostly executables, database files or maybe -graphic files. So you must not shift the remaining bytes to another -address. -Therefor commands for inserting or deleting bytes are disabled by -default. -You can use the r command to change a single byte, or -the R command to replace multiple characters. You can use a -numeric prefix for both commands. -

-You can add characters at the end of the file using the A command. -If you start with an empty file, you can create a binary file from -scratch. If the cursor is in the ASCII section of the screen and you -type 100AxESC, you create a file -which contents 100 x'es. -

-The D command can be used to truncate a file at a certain position. -Since there are no lines in a binary file, the D command deletes -to end of file. -

-If you have to edit a binary file where it does not matter to move bytes -to a different address, you can enable the insert and delete commands by -typing :set memmove. -Now you are able to use the i command for inserting bytes, the -x or X command to delete the byte over or before the cursor -and those types of d commands, which does not rely on text lines -(e.g. dSPACE, dfC, d/xyz, -d$, d'a, dnG). - -

-All edits can be undone by pressing the u key. -

Using ex (colon) commands

-The edit commands of the ex editor are usually not available in -standard vi implementations (:i[nsert], :a[ppend] -and :c[hange]). In bvi -they are available with extended options. There are five -modifiers a[scii], b[inary], d[ecimal], h[exadecimal] and -o[ctal] (ascii is default). Therefor you can insert, append -or change data in all five representations. -

-Example:
-you would like to append a file with data available in decimal -representation: -

-:a d
-0 12 3 128 255 17 0 0 255 255
-23 24 25 128 6 6 6
-.
-
-A line with only a period (.) in it will terminate the command. -
-You must not type values greater than a byte value (255 decimal, FF hex). -This causes an abandon of the command.
-Pressing the RETURN key does not insert -a newline - character into the file. If you use :i a (insert -ascii) you can use the special characters \n, \r, \t and \0. -

-An additional advantage is, that all typed bytes are inserted into the -file at once. If you insert characters in vi - mode, for every byte typed, -the whole remaining file has to be moved one position backwards. -

- -Back to the top - -

-Last update: June 1st 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/qt_find.html b/html/qt_find.html deleted file mode 100644 index bda685a..0000000 --- a/html/qt_find.html +++ /dev/null @@ -1,99 +0,0 @@ - - -BVI: Find and Replace - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-Editing Files
-Search Commands
-Bit-wise Operations
-Find and Replace
 -Yank and Put
-Settings
-Partial File Read
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Quick Tutorial -
Find and Replace -		 - -BVI -
-
-
- -

-The :s (substitute) command behaves a little bit -different to that of vi. If you type a command like this in vi   -:s/XXXX/UU/ then the four XXXX's are -replaced by -two UU's. This means, the file size decreases and all characters after -the replacement are moved to another position in the file. Since bvi -does not move characters, only two XX's are replaced by two UU's and -the third and fourth X still remains in the file.
-Another example: -

-:0,500s/Taste\0/Key\0/RETURN
-
-

-This command replaces within the first 500 bytes of a file the 0 - -terminated ASCII string "Taste" -with the 0 - terminated -string "Key". After the substitution -you will find a -character sequence "Key\0e\0" in the file.
-CAUTION: If the replace -string is longer than the find string, additional bytes are overwritten! -
-This behaviour will not be changed by setting the -:set memmove option! -

-Of course you can do also binary substitutions, similar to the search -command. The ability of remembering patterns like \(pattern\) -is currently not implemented. -

- -Back to the top - -

-Last update: Fri Jun 30 22:33:20 CEST 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/qt_partial.html b/html/qt_partial.html deleted file mode 100644 index 23acb7e..0000000 --- a/html/qt_partial.html +++ /dev/null @@ -1,145 +0,0 @@ - - -BVI: Partial File Read - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-Editing Files
-Search Commands
-Bit-wise Operations
-Find and Replace
-Yank and Put
-Settings
-Partial File Read
 -

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Quick Tutorial -
Partial File Read -		 - -BVI -
-
-
- -

-A new feature of version 1.3.0 is the Partial File Read. -If you want to edit a file, you have not to read the file into -memory but only the part you want to edit. You can write back this part -into the file after editing. -
-Example: -
-You have to change only some bytes of the header of a graphic file -(e.g. a color). Graphic files can be very large. With the -s -option you can load only the first kilobyte of the file: -

-             bvi -s 1000 large.gif
-
-In this case of course you cannot insert or delete bytes of the file. -The editor is set to the no memmove mode. You can write back -only as much bytes as you read before. If you add or delete bytes -even though, the extra bytes will be ignored or garbage will be -written to the file. -

-It is also possible to start not at the begin of the file, but at a -certain address. To do this you have to use the option -b. -You can read the file from this starting point until the end of the file -or you can use the -s option to specify a size or the --e option to specify an end address. -

-If you read the file not from the start an offset will be set to -display the correct address at the left side of the screen. If you change this -offset with the :set offset=nnnn command, this has -no effect to the write back operation. The edited part of the -file will always be written back at the same position, where it was read. -

-In the Linux /proc directory there are files which are listed -with length 0 in a directory listing. But in reality they have a content. -You can read this files, if you use the -s option and guess a -size. This size should be a little bit larger than the size you expect. -

-The same guidlines can be used, if you load a block device, e.g. a -floppy disk. -

-             bvi -s 1450k /dev/fd0
-
-After reading the device, you get a message with the value of the -real read bytes at the bottom of the screen: -
-             "/dev/fd0" range 0-1474559
-
-Note that the size value will be used to allocate memory before -reading the file. Therefore do not choose a too large size.
-Note further, that 1450k in the example above is calculated as -1450 * 1024 bytes. This gives 1484800 bytes allocated size. -If bvi reads the exact number of bytes you have asked for -in the -s option, the file may be larger. -

-WARNING: -

-Do not use bvi at mounted disk devices!
-Do not edit disk devices, if you don't know exactly what you change!
-You may make your disk unreadable by editing it!! -
-

Interaction with bmore

-You may use bmore to browse through large files or -devices. You may use the ASCII - or Hex - search possibilities to -locate a certain section of the file.
-If you see the desired part of the file on your screen, press w to -read the contents of the file displayed currently on your screen into -bvi. You can use a decimal prefix at the w - -command to read more or less bytes than displayed into bvi. -
-The letter w is the next letter after v, which -is used in more and bmore to read the whole file into vi or bvi! -

-If you used the ZZ or :w command, this part of the file will be -written back into the original file. - -

- -Back to the top - -

-Last update: Sun Jul 09 21:57:38 CEST 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/qt_search.html b/html/qt_search.html deleted file mode 100644 index 51ee5cc..0000000 --- a/html/qt_search.html +++ /dev/null @@ -1,116 +0,0 @@ - - -BVI: Search Commands - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-Editing Files
-Search Commands
 -Bit-wise Operations
-Find and Replace
-Yank and Put
-Settings
-Partial File Read
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Quick Tutorial -
Search Commands -		 - -BVI -
-
-
- -

-Additional to the well known / and ? for searching ASCII -strings there are two new commands for searching binary strings. These -are the keys \ and #. -

-In the ASCII search commands / and ? you can use \n, \r, -\t and \0. You can also use regular expressions. Do not use -^ and $, because there are no lines in a binary file. -Type /foo\0RETURN to -search for the null terminated string foo in the file. -

-In the Hex section you can search for a sequence of bytes in hexadecimal -notation, e.g. \01 AF 12RETURN, - which is the same as \01AF12 -RETURN. -You can also use regular expressions and quoted ASCII strings. Inside of -the quotes no character is treated as a special character!
-Example:   -\01 [^AF DE] "foo" 00 RETURN -
-This means: Search for a string beginning with 01, the second character -must not be a hex AF or DE, followed by the ASCII -characters foo, terminated with a binary zero. - -

Global Search

-There is also a global search option available, but only with the -print option.
-Example: -
-:g/text_pattern/pRETURN -
or
-:g\hex_pattern\pRETURN -
-This commands are displaying all found patterns, one per screen line. -Of course you can limit the search to a certain part of the file by -specifying the starting and ending address.
-Other forms of the global search command -are line oriented, therefor not useful for binary files and -not implemented, e.g.
-
- - - - -
:g/pattern/dDelete all lines containing pattern
:g/pattern/yYank all lines containing pattern
:g!/pattern/pPrint all lines not containing pattern
-
-

- -Back to the top - -

-Last update: Thu Jun 01 12:00:00 CEST 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/qt_set.html b/html/qt_set.html deleted file mode 100644 index ea28785..0000000 --- a/html/qt_set.html +++ /dev/null @@ -1,127 +0,0 @@ - - -BVI: Settings - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-Editing Files
-Search Commands
-Bit-wise Operations
-Find and Replace
-Yank and Put
-Settings
 -Partial File Read
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Quick Tutorial -
Settings -		 - -BVI -
-
-
- -

-To customize bvi some additional :set options are -available. You can add them to your .bvirc -file, if you need them all the time. - -

columns

-
-You can set the number of columns on the screen to an arbitrary value. -This might be useful if you edit a file with a fixed record length.
-Default value is the max. number of columns, divisible by four.
-Example: :set columns=13RETURN
-Abbreviation: :set cm=9RETURN -
- -

memmove

-
-This option enables the commands for inserting and deleting bytes. -
-Default: :set nomemmoveRETURN
-Abbreviation: :set mmRETURN -
- -

offset

-
-You can change the beginning of the displayed byte numbering to a -certain number. The default address of the first byte is 0. You can -change it to 1 or to any other number by typing:
-  :set offset=1RETURN
-You can also use a hexadecimal address, if you type a leading zero:
-  :set of=01FFRETURN
-The only commands which are not affected by these numbering is -:f or CTRL --G. These commands always -designates the first byte in file as 1. -
- -

unixstyle

-
-The rightmost character in the status line displays the ASCII value of -the current byte. For values below 32 you can use the notation used on -the ascii(7) man page (like NUL, SOH, STX etc.) if you do a
-:set unixstyleRETURN or a
-:set usRETURN. If you do a
-:set nousRETURN you get a -DOS style representation (^A, ^B, ^C etc.). -
- -

wordlength

-
-This setting is used to define the minimum length of a "word". -A "word" is a sequence of ASCII characters within a binary -file. The commands w, b, e, W, B and E are affected by -this setting. -

-Default: :set wordlength=4RETURN
-Abbreviation: :set wl=4RETURN -

-

- -Back to the top - -

-Last update: Thu Jun 01 12:00:00 CEST 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/qt_yank.html b/html/qt_yank.html deleted file mode 100644 index bfccb47..0000000 --- a/html/qt_yank.html +++ /dev/null @@ -1,133 +0,0 @@ - - -BVI: Yank and Put - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-Editing Files
-Search Commands
-Bit-wise Operations
-Find and Replace
-Yank and Put
 -Settings
-Partial File Read
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Quick Tutorial -
Yank and Put -		 - -BVI -
-
-
- -

-Starting with version 1.2.0 there is a new syntax for the yank and put -commands! Yank is now more similare to vi. -

- - - - - - - - - - - - - - - - - - -
ySPACEyanks byte under cursor
nySPACE - yanks n bytes, beginning at cursor - position
yfCyanks from current position to next - character C
y/xyzyanks from current position to first matching - pattern xyz
y$yanks from current position to EOF
y'ayanks from current position to mark a
ynGyanks from current position to byte with (decimal) - address n
ooverwrites the bytes after the cursor with the contents of the yank - or delete buffer
pputs the contents of the yank or delete - buffer after the cursor
Pappends the contents of the buffer to end - of file
- -

Using ex (colon) Commands

-:y(ank) -
-yank can be used with one or two addresses specified. One address -with no count specified copies the specified byte into the buffer. -Two addresses with no count specified copies multiple bytes -starting and ending with the specified bytes. Two addresses and a count -value copies count bytes starting at the second specified address (the -first address is ignored). If no address is specified, the current address -ist used by yank.
-Examples: -
- :start_addr,end_addr y RETURN
- :start_addr y byte_countRETURN
- :y byte_countRETURN
-
-
-

-:pu(t) -

-Restores previously deleted or yanked bytes after the address specified -in the put command. -
-

-:o(verwrite) -

-Overwrites bytes after the specified address with previously deleted or yanked -bytes. -
-

-NOTE: There are currently no namend buffers available. -

- -Back to the top - -

-Last update: June 1st 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/quick.html b/html/quick.html deleted file mode 100644 index 0f68551..0000000 --- a/html/quick.html +++ /dev/null @@ -1,200 +0,0 @@ - - -BVI: Quick Tutorial - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
 -Editing Files
-Search Commands
-Bit-wise Operations
-Find and Replace
-Yank and Put
-Settings
-Partial File Read
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Quick Tutorial - - -BVI -
-
-
- -

-This tutorial will explain all commands which behaves different to -vi. Note that, if you are on a Linux system, you will probably -have an 'improved' version of vi. Bvi is more similar to the standard -version. - -

The Screen

-
- - - - -
-000000
-00000C
-000018
-000024
-000030
-00003C
-000048
-000054
-000060
-00006C
-000078
-000084
-000090
-00009C
- 7F 45 4C 46 01 01
- 00 00 00 00 01 00
- 00 00 00 00 00 00
- 00 00 00 00 34 00
- 0C 00 09 00 00 00
- 00 00 00 00 55 89
- 53 C7 45 A4 00 00
- 00 00 00 83 7D 08
- 8C 02 00 00 E9 6F
- 00 00 00 00 6A 03
- 45 08 50 E8 FC FF
- 0C 85 D2 75 17 6A
- E9 43 02 00 00 8D
- 0C 85 D2 75 0D C7
- 01 00 00 00 00 00
- 03 00 01 00 00 00
- 00 00 0C 07 00 00
- 00 00 00 00 28 00
- 00 00 00 00 00 00
- E5 83 EC 68 57 56
- 00 00 C7 45 A0 01
- 00 75 13 6A 00 E8
- 02 00 00 8D B4 26
- 68 90 00 00 00 8B
- FF FF 89 C2 83 C4
- 01 E8 60 02 00 00
- 74 26 00 8D BC 27
- 45 A0 00 00 00 00
- .ELF........
- ............
- ............
- ....4.....(.
- ............
- ....U....hWV
- S.E......E..
- ....}..u.j..
- .....o.....&
- ....j.h.....
- E.P.........
- ...u.j..`...
- .C....t&...'
- ...u..E.....
"set.o" 3500 bytes000001 \105 0x45 69 'E'
-
-

-The screen is divided into four areas, symbolized by four different -colors. The magenta area contents the addresses in hexadecimal -notation. The green area contents the values of the edited file in -hexadecimal notation. The red area contents the same bytes in ASCII -representation. The yellow status line displays on the left side the -current status messages and on the right site the current position -of the cursor and the value of the byte on this address in octal, -hexadecimal, decimal and ASCII notation. -
-You can toggle between the Hex and ASCII value of the same byte by -pressing the TAB key both in command -and input mode. - -

Command Line Options

-There are some additional command line options in bvi:
- -
--f script -
-This command provides a means for collecting a series of ex -(colon) commands into a script file, then using this file to edit -other files. Since there is no binary stream editor bsed, you -can use this option to make several global changes in a binary file. -You can do this of course with the source command (:so file) -from within bvi too. - -
--b begin -
-This option causes bvi to load a file not from start but from address -begin. - -
--e end -
-This option causes bvi to load a file not till end but till address -end. - -
--s size -
-This option causes bvi not to load the complete file but only size -bytes. This option can also be used to read a file reported with a -length 0 like some files in the Linux /proc -directory. -

-begin, end or size can be an integer value (decimal or -hexadecimal) or an integer value with an appended k (for -multiply by 1024) or m (for multiply by 1.048.576). -

-You should use at most two of the three address options to avoid ambiguity! - - -

Not Implemented Commands

-

-

    -
  • :map and :unmap (Macros) -
  • :abbreviate (:ab) and :una -
  • no named buffers. -
-

- -Back to the top - -

-Last update: October 19th 2000 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/rpm.html b/html/rpm.html deleted file mode 100644 index 530330f..0000000 --- a/html/rpm.html +++ /dev/null @@ -1,6 +0,0 @@ - -Source RPM - - -Switching to http://sites.inka.de/mips/unix/index.html . . . - diff --git a/html/set.html b/html/set.html deleted file mode 100644 index 1b521c7..0000000 --- a/html/set.html +++ /dev/null @@ -1,117 +0,0 @@ - -BVI: Set Commands - - - - - - -
-Command Overview -
Set Commands -		 - -BVI -
-
-
-

- -

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

- - - - - - - - - - - -
CommandBVIVI
Search
settings		 - - - - - - - -
:set wrapscan or :set ws
- :set nows		When this option is set, pattern searches resulting from a /, - ?, n, N (#, \) command automatically wrap around to the opposit end of the file - and continue whenever the beginning or end of a file is reached.
:set ignorecase or :set ic
- :set noic		Uppercase and lowercase characters in text are treated identically - in regular expression matching
:set magic
- :set nomagic		Enables metacharacters for use in regular expressions
-
Display
options		 - - - - - -
:set showmode
- :set noshowmode		Displays a status message in the lowest line on the screen
:set terse
- :set noterse		The terse option lets you obtain shorter error diagnostics.
-
File
options		 - - - - - -
:set readonly or :set ro
- :set noro		This option sets the read-only flag for the file being editeds, - thus preventing accidental overwriting at the end of the session.
:set autowrite or :set aw
- :set noaw		Causes the contents of the buffer to be written to the current file - if you have modified them and given a :next, :rewind or ! - command.
-
bvi
options		 - - - - - - - - - - - -
:set columns=13
:set cm=5		You can set the number of bytes displayed in on screenline. - Default is max. number divisible by four.
:set memmove
:set nomm		If memmove is set, you can use commands to insert or delete bytes. - This can be dangerous for e.g. executable programs. - Default is nomemmove.
:set offset=1
:set of=5		An offset is added to all addresses and byte counts. Default - address of the first byte is 0.
:set wordlength=5
:set wl=8		Length of an ASCII-string found by w, W, b or B
:set unixstyle
:set nous		displays ASCII characters below 32 in the status line in - Unix-style instead of DOS-style
-		 - Not available. -
- -

-

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

- -Back to the top - -

-Last update: October 30th 1999 by Gerhard Bürgmann, -Purkersdorf/Austria - - - diff --git a/html/sitemap.html b/html/sitemap.html deleted file mode 100644 index 5518843..0000000 --- a/html/sitemap.html +++ /dev/null @@ -1,160 +0,0 @@ - - -BVI: Sitemap - - - - - - - -
- - -
-

-Home
-

-

-Quick Tutorial
-

-

-Download
-

-

-Installation
-

-

-Command Overview
-

-

-bmore
-

-

-Deutsche Beschreibung
-

-
- -		 - - - - -
-Sitemap - - -BVI -
-
-
- -

-

-

- -Back to the top - -

-Last update: January 8th 2004 by Gerhard Bürgmann, -Purkersdorf/Austria -
- diff --git a/html/yank.html b/html/yank.html deleted file mode 100644 index 18a31cf..0000000 --- a/html/yank.html +++ /dev/null @@ -1,142 +0,0 @@ - -BVI: Yank and Put Commands - - - - - - -
-Command Overview -
Yank and Put Commands -		 - -BVI -
-
-
-

- -

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

-NOTE: the o command (overwriting put) is the only command in -bvi that uses a key for a complete different purpose than in vi. -

- - - - - - - - - - - - - - -
CommandBVIVI
Put
bytes		 - - - -
  p  put the contents of the yank or delete buffer after cursor position
-
- - -
  P  append the contents of the yank or delete buffer at EOF
-		 - - -
  P  put the contents of the yank or delete buffer - before cursor position
-
- - -
  o  overwrite the following bytes with the contents - of the yank or delete buffer
-		 - - -
not available
-
Yank
bytes		 - - - - - - - - - - -
ySPACEyank byte at cursor position
yfCyank from current position to next character C
y/xyzyank from current position to matching pattern xyz -
y?xyzyank from current position to matching pattern xyz in reverse direction -
y'ayank from current position to mark a
ynGyank from current position to byte with (decimal) address n
-
- - -
not available
-		 - - - - - -
yy  yank line
y)yank from cursor position through first - following end of sentence
y}yank from cursor position through first - following end of paragraph
y]yank from cursor position through first - following end of section
-
- - - - - -
y\6a 56 ff  yank from cursor position to first occurance of hex pattern - 6a 56 ff
y#6a 56 ff  yank from cursor position to first occurance of hex pattern - 6a 56 ff in reverse direction
-		 - - -
not available
-
- - -
  y$  yank from current position to EOF
-		 - - -
  y$  yank from current position to end of line
-
-

-Note that most of the commands can be used with a decimal repeat count in front -of the command! - -

-

-[ Cursor Movements -| Edit Cmds -| Yank and Put Cmds -| Set Options -| Colon (ex) Cmds -] -
-

- -Back to the top - -

-Last update: October 30th 1999 by Gerhard Bürgmann, -Purkersdorf/Austria - - - diff --git a/io.c b/io.c index b868dfa..c8232ab 100644 --- a/io.c +++ b/io.c @@ -8,10 +8,12 @@ * 2000-03-23 V 1.3.0 beta * 2000-08-17 V 1.3.0 final * 2004-01-04 V 1.3.2 + * 2010-06-02 V 1.3.4 + * 2014-05-03 V 1.4.0 * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2004 by Gerhard Buergmann + * Copyright 1996-2014 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -30,11 +32,20 @@ #include "bvi.h" #include "set.h" -#include -#ifndef SIZE_T_MAX -# define SIZE_T_MAX ULONG_MAX +#if 0 +/* nowadays (2009) we should make sure that bvi is compiled with LFS support: */ +/* defines _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64 */ +/* if compiled without LFS support, stat() open() lseek() will fail with */ +/* EOVERFLOW(75) Value too large for defined data type */ +/* see README for configure arguments to enable lfs support in 32-bit executables */ +/* cygwin enables lfs by default */ #endif +#include +# ifndef OFF_T_MAX +# define OFF_T_MAX ULONG_LONG_MAX +# endif + #ifdef HAVE_UNISTD_H # include #endif @@ -58,7 +69,7 @@ save(fname, start, end, flags) int flags; { int fd; - char string[255]; + char *string; char *newstr; off_t filesize; @@ -66,16 +77,23 @@ save(fname, start, end, flags) emsg("No file|No current filename"); return 0; } + string = malloc((size_t)strlen(fname) + MAXCMD); + if (string == NULL) { + emsg("Out of memory"); + return 0; + } if (stat(fname, &buf) == -1) { newstr = "[New file] "; } else { if (S_ISDIR(buf.st_mode)) { sprintf(string, "\"%s\" Is a directory", fname); msg(string); + free(string); return 0; } else if (S_ISCHR(buf.st_mode)) { sprintf(string, "\"%s\" Character special file", fname); msg(string); + free(string); return 0; } else if (S_ISBLK(buf.st_mode)) { /* @@ -90,36 +108,42 @@ save(fname, start, end, flags) if (filemode == PARTIAL) flags = O_RDWR; if ((fd = open(fname, flags, 0666)) < 0) { sysemsg(fname); + free(string); return 0; } if (filemode == PARTIAL) { if (block_read) { filesize = block_read; - sprintf(string, "\"%s\" range %lu-%lu", fname, - (unsigned long)block_begin, - (unsigned long)(block_begin - 1 + filesize)); + sprintf(string, "\"%s\" range %llu-%llu", fname, + (unsigned long long)block_begin, + (unsigned long long)(block_begin - 1 + filesize)); if (lseek(fd, block_begin, SEEK_SET) < 0) { sysemsg(fname); + free(string); return 0; } } else { msg("Null range"); + free(string); return 0; } } else { filesize = end - start + 1L; - sprintf(string, "\"%s\" %s%lu bytes", fname, newstr, - (unsigned long)filesize); + + sprintf(string, "\"%s\" %s%llu bytes", fname, newstr, + (unsigned long long)filesize); } if (write(fd, start, filesize) != filesize) { sysemsg(fname); + free(string); close(fd); return 0; } close(fd); edits = 0; msg(string); + free(string); return 1; } @@ -130,17 +154,31 @@ load(fname) char *fname; { int fd = -1; - char string[MAXCMD]; + char *string; buf.st_size = 0L; if (fname != NULL) { + /* sprintf(string, "\"%s\"", fname); msg(string); refresh(); + */ if (stat(fname, &buf) == -1) { - filemode = NEW; + /* check for EOVERFLOW 75 */ + /* Value too large for defined data type */ + /* means bvi is compiled without lfs support */ + if (errno == ENOENT) { + filemode = NEW; + } else { + move(maxy, 0); + endwin(); + perror(fname); + exit(0); + } + /* } else if (S_ISDIR(buf.st_mode)) { filemode = DIRECTORY; + */ } else if (S_ISCHR(buf.st_mode)) { filemode = CHARACTER_SPECIAL; } else if (S_ISBLK(buf.st_mode)) { @@ -158,15 +196,23 @@ load(fname) sysemsg(fname); filemode = ERROR; } - } else if (S_ISREG(buf.st_mode)) { - if ((unsigned long)buf.st_size > (unsigned long)SIZE_T_MAX) { + } else if (S_ISREG(buf.st_mode) || S_ISDIR(buf.st_mode)) { +#if 0 + /* stat() call above will fail if file is too large */ + /* this size check will never fail */ + if ((unsigned long long)buf.st_size > (unsigned long long)OFF_T_MAX) { move(maxy, 0); endwin(); printf("File too large\n"); exit(0); } +#endif if ((fd = open(fname, O_RDONLY)) > 0) { - filemode = REGULAR; + if (S_ISREG(buf.st_mode)) { + filemode = REGULAR; + } else { + filemode = DIRECTORY; + } if (access(fname, W_OK)) { P(P_RO) = TRUE; params[P_RO].flags |= P_CHANGED; @@ -182,6 +228,9 @@ load(fname) if (mem != NULL) free(mem); memsize = 1024; if (block_flag) { + if (block_flag == BLOCK_BEGIN) { + block_size = buf.st_size - block_begin; + } memsize += block_size; } else if (filemode == REGULAR) { memsize += buf.st_size; @@ -194,6 +243,15 @@ load(fname) } clear_marks(); + if (fname != NULL) { + string = malloc((size_t)strlen(fname) + MAXCMD); + } else { + string = malloc(MAXCMD); + } + if (string == NULL) { + emsg("Out of memory"); + return 0; + } if (block_flag && ((filemode == REGULAR) || (filemode == BLOCK_SPECIAL))) { if (lseek(fd, block_begin, SEEK_SET) < 0) { @@ -204,9 +262,9 @@ load(fname) sprintf(string, "\"%s\" Empty file", fname); filemode = ERROR; } else { - sprintf(string, "\"%s\" range %lu-%lu", fname, - (unsigned long)block_begin, - (unsigned long)(block_begin + filesize - 1)); + sprintf(string, "\"%s\" range %llu-%llu", fname, + (unsigned long long)block_begin, + (unsigned long long)(block_begin + filesize - 1)); filemode = PARTIAL; block_read = filesize; P(P_OF) = block_begin; @@ -215,7 +273,7 @@ load(fname) msg(string); refresh(); } - } else if (filemode == REGULAR) { + } else if ((filemode == REGULAR) || (filemode == DIRECTORY)) { filesize = buf.st_size; if (read(fd, mem, filesize) != filesize) { sysemsg(fname); @@ -231,9 +289,9 @@ load(fname) sprintf(string, "\"%s\" [New File]", fname); break; case REGULAR: - sprintf(string, "\"%s\" %s%lu bytes", fname, + sprintf(string, "\"%s\" %s%llu bytes", fname, P(P_RO) ? "[Read only] " : "", - (unsigned long)filesize); + (unsigned long long)filesize); break; case DIRECTORY: sprintf(string, "\"%s\" Directory", fname); @@ -252,6 +310,7 @@ load(fname) loc = HEX; x = AnzAdd; y = 0; repaint(); + free(string); return(filesize); } @@ -336,12 +395,14 @@ enlarge(add) void do_shell() { + int ret; + addch('\n'); savetty(); #ifdef DJGPP - system(""); + ret = system(""); #else - system(shell); + ret = system(shell); #endif resetty(); } diff --git a/patchlevel.h b/patchlevel.h index da1249b..7851500 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -1 +1 @@ -#define VERSION "1.3.2" +#define VERSION "1.4.0" diff --git a/re.c b/re.c index 5fba7cc..414774d 100644 --- a/re.c +++ b/re.c @@ -8,8 +8,10 @@ * 1999-09-10 V 1.2.0 * 2000-04-25 V 1.3.0 beta * 2000-09-29 V 1.3.0 final + * 2010-06-02 V 1.3.4 + * 2013-08-24 V 1.4.0 * - * Copyright 1996-2003 by Gerhard Buergmann + * Copyright 1996-2013 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -43,7 +45,7 @@ char *emptyclass = "Bad character class|Empty byte class '[]' or '[^]' cannot ma -int +PTR bregexec(start, scan) PTR start; char *scan; @@ -59,10 +61,12 @@ bregexec(start, scan) if (P(P_IC) && smode == ASCII) test = toupper(*start); else test = *start; if (count == 1) { - if (test != *scan) return 0; + /* if (test != *scan) return 0; */ + if (test != *scan) return NULL; scan++; } else if (count > 1) { - if (sbracket(test, scan, count)) return 0; + /* if (sbracket(test, scan, count)) return 0; */ + if (sbracket(test, scan, count)) return NULL; scan += count; } *act++ = *start++; @@ -83,9 +87,11 @@ bregexec(start, scan) while (start < maxpos) { if (bregexec(start, scan + count)) { *act = '\0'; - return 1; + /* return 1; */ + return start; } - if (sbracket(test, scan, count)) return 0; + /* if (sbracket(test, scan, count)) return 0; */ + if (sbracket(test, scan, count)) return NULL; *act++ = *start++; if (P(P_IC) && smode == ASCII) test = toupper(*start); else test = *start; @@ -100,14 +106,19 @@ bregexec(start, scan) } } else { /* ".*" */ while (start < maxpos) { - if (bregexec(start, scan)) { *act = '\0'; return 1; } + /* if (bregexec(start, scan)) { *act = '\0'; return 1; } */ + if (bregexec(start, scan)) { + *act = '\0'; + return start; + } start++; } } } } *act = '\0'; - return 1; /* found */ + return start; /* found */ + /* return 1; */ } @@ -487,17 +498,23 @@ patcpy(s1, s2, delim) PTR +fsearch_end(start, end, smem, s_end) +/* fsearch(start, end, smem) +*/ PTR start; PTR end; char *smem; + PTR *s_end; { PTR spos; signal(SIGINT, jmpproc); for (spos = start; spos <= end; spos++) { - if (bregexec(spos, smem)) { + /* if (bregexec(spos, smem)) { */ + if (*s_end = bregexec(spos, smem)) { signal(SIGINT, SIG_IGN); + *s_end++; return(spos); } } @@ -506,6 +523,17 @@ fsearch(start, end, smem) } +PTR +fsearch(start, end, smem) + PTR start; + PTR end; + char *smem; +{ + PTR s_end; + return fsearch_end(start, end, smem, &s_end); +} + + PTR rsearch(start, end, smem) PTR start; @@ -542,7 +570,7 @@ calc_addr(pointer, def_addr) addr = def_addr; SKIP_WHITE if (*cmd >= '1' && *cmd <= '9') { - addr = mem + strtol(cmd, &cmd, 10) - P(P_OF); + addr = mem + strtoll(cmd, &cmd, 10) - P(P_OF); } else { ch = *cmd; switch (ch) { @@ -619,19 +647,11 @@ calc_addr(pointer, def_addr) if (*cmd == '+') { cmd++; SKIP_WHITE - if (*cmd >= '1' && *cmd <= '9') { - addr += strtol(cmd, &cmd, 10); - } else if (*cmd == '0') { - addr += strtol(cmd, &cmd, 16); - } + addr += strtoll(cmd, &cmd, 0); } else { cmd++; SKIP_WHITE - if (*cmd >= '1' && *cmd <= '9') { - addr -= strtol(cmd, &cmd, 10); - } else if (*cmd == '0') { - addr -= strtol(cmd, &cmd, 16); - } + addr -= strtoll(cmd, &cmd, 0); } SKIP_WHITE } diff --git a/script b/script index 87e0be4..328b638 100644 --- a/script +++ b/script @@ -1,4 +1,8 @@ +set columns=8 set mm + + + 0,20d w! %.new q diff --git a/set.c b/set.c index 7a2e0d2..fefc63b 100644 --- a/set.c +++ b/set.c @@ -11,8 +11,10 @@ * 2000-07-15 V 1.3.0 final * 2001-10-10 V 1.3.1 * 2003-07-03 V 1.3.2 + * 2010-06-02 V 1.2.4 + * 2014-09-30 V 1.4.0 * - * Copyright 1996-2003 by Gerhard Buergmann + * Copyright 1996-2014 by Gerhard Buergmann * gerhard@puon.at * * This program is free software; you can redistribute it and/or modify it @@ -33,8 +35,8 @@ static int from_file = 0; static FILE *ffp; -static char fbuf[256]; -static char buf[64]; +static char fbuf[MAXCMD+1]; +static char buf[MAXCMD+1]; struct param params[] = { { "autowrite", "aw", FALSE, "", P_BOOL }, @@ -53,6 +55,7 @@ struct param params[] = { { "window", "window", 25, "", P_NUM }, { "wordlength", "wl", 4, "", P_NUM }, { "wrapscan", "ws", TRUE, "", P_BOOL }, + { "highlight", "hl", TRUE, "", P_BOOL }, #if defined(__MSDOS__) && !defined(DJGPP) { "color", "co", 7, "", P_NUM }, #endif @@ -99,8 +102,9 @@ doset(arg) sprintf(buf, " %s=%s", params[i].fullname, params[i].svalue); else - sprintf(buf, " %s=%ld", params[i].fullname, - params[i].nvalue); + + sprintf(buf, " %s=%lld", params[i].fullname, + (long long)params[i].nvalue); msg(buf); return 0; } @@ -117,11 +121,7 @@ doset(arg) return 1; } else { s = arg + strlen(s) + 1; - if (*s == '0') { - params[i].nvalue = strtol(s, &s, 16); - } else { - params[i].nvalue = strtol(s, &s, 10); - } + params[i].nvalue = strtoll(s, &s, 0); params[i].flags |= P_CHANGED; #if defined(__MSDOS__) && !defined(DJGPP) if (i == P_CO) { @@ -152,6 +152,10 @@ doset(arg) } else { params[i].nvalue = state; params[i].flags |= P_CHANGED; + if (i == P_HL && state == FALSE) { + hl_spat = FALSE; + repaint(); + } } } } else { @@ -187,7 +191,7 @@ showparms(all) else if (p->flags & P_TEXT) sprintf(buf, " %s=%s\n", p->fullname, p->svalue); else - sprintf(buf, " %s=%ld\n", p->fullname, p->nvalue); + sprintf(buf, " %s=%lld\n", p->fullname, (long long)p->nvalue); msg(buf); n++; @@ -205,10 +209,13 @@ int read_rc(fn) char *fn; { - if((ffp = fopen(fn, "r")) == NULL) return -1; + int i; + + if ((ffp = fopen(fn, "r")) == NULL) return -1; from_file = 1; - while(fgets(fbuf, 255, ffp) != NULL) { - strtok(fbuf, "\n\r"); + while (fgets(fbuf, MAXCMD, ffp) != NULL) { + i = strlen(fbuf) - 1; + while ((i >= 0) && (fbuf[i] == NL || fbuf[i] == CR)) fbuf[i--] = '\0'; docmdline(fbuf); } fclose(ffp); @@ -245,7 +252,7 @@ do_logic(mode, str) } else if (str[0] == 'b' || str[0] == 'B') { value = strtol(str + 1, NULL, 2); } else if (str[0] == '0') { - value = strtol(str, NULL, 16); + value = strtol(str, NULL, 0); for (n = 0; n < strlen(str); n++) { if (!isxdigit(str[n])) { value = -1; @@ -311,12 +318,14 @@ getcmdstr(p, x) int x; { int c; - int n; + int i, n; char *buff, *q; if (from_file) { - if(fgets(p, 255, ffp) != NULL) { - strtok(p, "\n\r"); + if (fgets(p, 255, ffp) != NULL) { + // strtok(p, "\n\r"); + i = strlen(p) - 1; + while ((i >= 0) && (p[i] == NL || p[i] == CR)) p[i--] = '\0'; return 0; } else { return 1; @@ -329,6 +338,7 @@ getcmdstr(p, x) do { switch (c = vgetc()) { case BVICTRL('H'): + case ASCII_DEL: case KEY_BACKSPACE: case KEY_LEFT: if (p > buff) { @@ -359,6 +369,9 @@ getcmdstr(p, x) #if CR != KEY_ENTER case CR: #endif + case KEY_RIGHT: + case KEY_UP: + case KEY_DOWN: case KEY_ENTER: break; default: /* a normal character */ diff --git a/set.h b/set.h index 116f32e..55aac90 100644 --- a/set.h +++ b/set.h @@ -2,7 +2,7 @@ * * NOTE: Edit this file with tabstop=4 ! * - * Copyright 1996-2002 by Gerhard Buergmann + * Copyright 1996-2014 by Gerhard Buergmann * Gerhard.Buergmann@puon.at * * 1998-03-14 V 1.0.0 @@ -11,6 +11,8 @@ * 1999-07-02 V 1.2.0 beta * 1999-08-14 V 1.2.0 final * 2000-08-21 V 1.3.0 final + * 2010-06-02 V 1.3.4 + * 2013-08-23 V 1.4.0 * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -29,7 +31,7 @@ struct param { char *fullname; /* full parameter name */ char *shortname; /* permissible abbreviation */ - long nvalue; + off_t nvalue; char *svalue; int flags; }; @@ -64,7 +66,8 @@ extern struct param params[]; #define P_LI 13 /* lines */ #define P_WL 14 /* Wordlength for w, W, b, B command */ #define P_WS 15 /* wrapscan */ -#define P_CO 16 /* color/attribute setting */ +#define P_HL 16 /* highlight search enabled */ +#define P_CO 17 /* color/attribute setting */ /* * Macro to get the value of a parameter diff --git a/tags b/tags new file mode 100644 index 0000000..33be205 --- /dev/null +++ b/tags @@ -0,0 +1,635 @@ +!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ +!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ +!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/ +!_TAG_PROGRAM_NAME Exuberant Ctags // +!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/ +!_TAG_PROGRAM_VERSION 5.8 // +AND bvi.h 88;" d +ANSI bmore.h 103;" d +ANSI bvi.h 117;" d +APPEND comm.c 50;" d file: +APPEND comm.c 53;" d file: +ASCII bmore.h 82;" d +ASCII bvi.h 95;" d +A_ATTRIBUTES doscur.h 56;" d +A_BLINK doscur.h 54;" d +A_BOLD doscur.h 52;" d +A_CHARTEXT doscur.h 55;" d +A_NORMAL doscur.h 50;" d +A_REVERSE doscur.h 53;" d +A_STANDOUT doscur.h 51;" d +AnzAdd bmore.c /^int AnzAdd;$/;" v +AnzAdd bvi.c /^int AnzAdd, Anzahl, Anzahl3;$/;" v +Anzahl bvi.c /^int AnzAdd, Anzahl, Anzahl3;$/;" v +Anzahl3 bvi.c /^int AnzAdd, Anzahl, Anzahl3;$/;" v +Ausgabe_Datei bvi.c /^FILE *Ausgabe_Datei;$/;" v +BACKWARD bmore.h 84;" d +BACKWARD bvi.h 97;" d +BLOCK_BEGIN bvi.h /^ BLOCK_BEGIN = 1,$/;" e enum:_block_datum +BLOCK_END bvi.h /^ BLOCK_END = 2,$/;" e enum:_block_datum +BLOCK_LEN bvi.h /^ BLOCK_LEN = 4$/;" e enum:_block_datum +BLOCK_SPECIAL bmore.h 74;" d +BLOCK_SPECIAL bvi.h 64;" d +BMOBJ Makefile /^BMOBJ = bmore.o bm_unix.o recomp.o$/;" m +BS bmore.h 87;" d +BS bvi.h 100;" d +BUFFER bmore.h 115;" d +BUFFER bvi.h 131;" d +BVICTRL bmore.h 91;" d +BVICTRL bvi.h 103;" d +CC Makefile /^CC = gcc$/;" m +CFLAGS Makefile /^CFLAGS = -g -O2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES$/;" m +CHARACTER_SPECIAL bmore.h 73;" d +CHARACTER_SPECIAL bvi.h 63;" d +CMDLNG bvi.h 105;" d +CMDSZ comm.c 56;" d file: +COLS dosio.c /^int COLS = 80;$/;" v +CR bmore.h 85;" d +CR bvi.h 98;" d +DEFS Makefile /^DEFS = -DHAVE_CONFIG_H$/;" m +DELIM bmore.h 106;" d +DELIM bmore.h 111;" d +DELIM bvi.h 120;" d +DELIM bvi.h 127;" d +DIRECTORY bmore.h 72;" d +DIRECTORY bvi.h 62;" d +ECHO dosio.c /^int ECHO = TRUE;$/;" v +END bmore.h 78;" d +END bvi.h 68;" d +ERR doscur.h 147;" d +ERROR bmore.h 69;" d +ERROR bvi.h 59;" d +ESC bmore.h 88;" d +ESC bvi.h 101;" d +ESC doscur.h 31;" d +FALSE bmore.h 99;" d +FALSE bvi.h 113;" d +FALSE doscur.h 29;" d +FORWARD bmore.h 83;" d +FORWARD bvi.h 96;" d +HAVE_CURSES_H acconfig.h 5;" d +HAVE_FCNTL_H config.h 16;" d +HAVE_FCNTL_H dosconf.h 40;" d +HAVE_INTTYPES_H config.h 19;" d +HAVE_LOCALE_H dosconf.h 44;" d +HAVE_MEMMOVE config.h 22;" d +HAVE_MEMMOVE dosconf.h 31;" d +HAVE_MEMORY_H config.h 25;" d +HAVE_NCURSES_H acconfig.h 3;" d +HAVE_NCURSES_H config.h 5;" d +HAVE_NCURSES_TERM_H acconfig.h 11;" d +HAVE_STDINT_H config.h 31;" d +HAVE_STDLIB_H config.h 34;" d +HAVE_STRDUP config.h 37;" d +HAVE_STRDUP dosconf.h 34;" d +HAVE_STRERROR config.h 40;" d +HAVE_STRINGS_H config.h 43;" d +HAVE_STRING_H config.h 46;" d +HAVE_STRTOL config.h 49;" d +HAVE_STRTOL dosconf.h 37;" d +HAVE_SYS_STAT_H config.h 52;" d +HAVE_SYS_TYPES_H config.h 55;" d +HAVE_TERMCAP_H config.h 58;" d +HAVE_TERMIOS_H config.h 61;" d +HAVE_TERMIO_H config.h 64;" d +HAVE_TERM_H config.h 67;" d +HAVE_UNISTD_H config.h 70;" d +HEADER Makefile /^HEADER = bvi.h set.h$/;" m +HELPFILE bmore.c 42;" d file: +HELPFILE bmore.c 44;" d file: +HEX bvi.h 94;" d +Home bm_unix.c /^char *Home; \/* go to home *\/$/;" v +INSTALL Makefile /^INSTALL = \/usr\/bin\/install -c$/;" m +INSTALL_DATA Makefile /^INSTALL_DATA = ${INSTALL} -m 644$/;" m +INSTALL_PROGRAM Makefile /^INSTALL_PROGRAM = ${INSTALL}$/;" m +JOEHTG bvi.h 41;" d +KEY_BACKSPACE bvi.h 150;" d +KEY_BACKSPACE doscur.h 42;" d +KEY_DC doscur.h 45;" d +KEY_DOWN doscur.h 34;" d +KEY_ENTER doscur.h 41;" d +KEY_F doscur.h 33;" d +KEY_F0 doscur.h 32;" d +KEY_HOME doscur.h 43;" d +KEY_IC doscur.h 46;" d +KEY_LEFT doscur.h 36;" d +KEY_LL doscur.h 44;" d +KEY_NPAGE doscur.h 38;" d +KEY_PPAGE doscur.h 39;" d +KEY_RETURN doscur.h 40;" d +KEY_RIGHT doscur.h 37;" d +KEY_UP doscur.h 35;" d +LDFLAGS Makefile /^LDFLAGS= $/;" m +LIBS Makefile /^LIBS = -lncurses $/;" m +LINES dosio.c /^int LINES = 25;$/;" v +LROTATE bvi.h 86;" d +LSHIFT bvi.h 84;" d +MAXCMD bmore.h 114;" d +MAXCMD bvi.h 130;" d +MAXNAME comm.c 57;" d file: +MAX_ONE_ARG comm.c 62;" d file: +MAX_ONE_FILE comm.c 64;" d file: +NEED_PUTC_CHAR acconfig.h 9;" d +NEED_PUTC_CHAR bm_unix.c 52;" d file: +NEG bvi.h 91;" d +NEW bmore.h 71;" d +NEW bvi.h 61;" d +NL bmore.h 86;" d +NL bvi.h 99;" d +NODEL dosio.c /^int NODEL = FALSE;$/;" v +NOT bvi.h 92;" d +NO_ADDR comm.c 59;" d file: +NO_ARG comm.c 60;" d file: +NO_SYSERRL acconfig.h 7;" d +NULL bmore.h 94;" d +NULL bvi.h 108;" d +OBJS Makefile /^OBJS = bvi.o comm.o set.o re.o io.o edit.o recomp.o$/;" m +OFF_T_MAX io.c 46;" d file: +ONE bmore.h 79;" d +ONE bvi.h 69;" d +ONE_ARG comm.c 61;" d file: +ONE_FILE comm.c 63;" d file: +OR bvi.h 89;" d +P set.h 75;" d +PARTIAL bmore.h 75;" d +PARTIAL bvi.h 65;" d +PRINTF bmore.c 37;" d file: +PRINTF bmore.c 39;" d file: +PTR bmore.h 104;" d +PTR bmore.h 110;" d +PTR bvi.h 118;" d +PTR bvi.h 126;" d +P_AW set.h 53;" d +P_BOOL set.h 41;" d +P_CHANGED set.h 44;" d +P_CM set.h 54;" d +P_CO set.h 70;" d +P_EB set.h 55;" d +P_HL set.h 69;" d +P_IC set.h 56;" d +P_LI set.h 66;" d +P_MA set.h 57;" d +P_MM set.h 58;" d +P_MO set.h 62;" d +P_NUM set.h 42;" d +P_OF set.h 59;" d +P_RO set.h 60;" d +P_SS set.h 61;" d +P_TE set.h 64;" d +P_TEXT set.h 43;" d +P_TT set.h 63;" d +P_US set.h 65;" d +P_WL set.h 67;" d +P_WS set.h 68;" d +REGULAR bmore.h 70;" d +REGULAR bvi.h 60;" d +REPLACE bmore.h 90;" d +RROTATE bvi.h 87;" d +RSHIFT bvi.h 85;" d +SEARCH bmore.h 89;" d +SEARCH bvi.h 102;" d +SHELL Makefile /^SHELL = \/bin\/sh$/;" m +SIZEOF_INT config.h 73;" d +SIZEOF_LONG config.h 76;" d +SIZEOF_VOID_P config.h 79;" d +SKIP_WHITE bvi.h 133;" d +STAR bmore.h 80;" d +STAR bvi.h 70;" d +STDC_HEADERS config.h 82;" d +STDC_HEADERS dosconf.h 28;" d +S_GLOBAL bvi.h 81;" d +S_ISBLK bvi.h 199;" d +S_ISCHR bvi.h 198;" d +S_ISDIR bvi.h 197;" d +S_ISFIFO bvi.h 201;" d +S_ISREG bvi.h 200;" d +TBUFSIZ bm_dos.c 32;" d file: +TBUFSIZ bm_unix.c 32;" d file: +TRUE bmore.h 98;" d +TRUE bvi.h 112;" d +TRUE doscur.h 28;" d +U_APPEND bvi.h 78;" d +U_BACK bvi.h 77;" d +U_DELETE bvi.h 76;" d +U_EDIT bvi.h 73;" d +U_INSERT bvi.h 75;" d +U_TILDE bvi.h 79;" d +U_TRUNC bvi.h 74;" d +VERSION patchlevel.h 1;" d +WINDOW doscur.h 60;" d +WRITE comm.c 49;" d file: +WRITE comm.c 52;" d file: +XOR bvi.h 90;" d +_block_datum bvi.h /^typedef enum _block_datum {$/;" g +ac_fn_c_check_func configure /^ac_fn_c_check_func ()$/;" f +ac_fn_c_check_header_compile configure /^ac_fn_c_check_header_compile ()$/;" f +ac_fn_c_check_header_mongrel configure /^ac_fn_c_check_header_mongrel ()$/;" f +ac_fn_c_check_type configure /^ac_fn_c_check_type ()$/;" f +ac_fn_c_compute_int configure /^ac_fn_c_compute_int ()$/;" f +ac_fn_c_try_compile configure /^ac_fn_c_try_compile ()$/;" f +ac_fn_c_try_cpp configure /^ac_fn_c_try_cpp ()$/;" f +ac_fn_c_try_link configure /^ac_fn_c_try_link ()$/;" f +ac_fn_c_try_run configure /^ac_fn_c_try_run ()$/;" f +act_pat re.c /^char act_pat[MAXCMD]; \/* found pattern *\/$/;" v +addch doscur.h 95;" d +addfile dosio.c /^addfile(char *fname)$/;" f +addfile io.c /^addfile(fname)$/;" f +addr_flag comm.c /^int addr_flag;$/;" v +addr_form bmore.c /^char addr_form[15];$/;" v +addr_form bvi.c /^char addr_form[15];$/;" v +addstr doscur.h 99;" d +again recomp.c /^int again = 0;$/;" v +alloc_buf dosio.c /^alloc_buf(off_t n, char **buffer)$/;" f +alloc_buf io.c /^alloc_buf(n, buffer)$/;" f +altfile comm.c /^static char *altfile = NULL; \/* alternate file *\/$/;" v file: +ambigous comm.c /^char *ambigous = "Ambigous|Too many file names";$/;" v +ambvalue comm.c /^char *ambvalue = "Ambigous|Too many values";$/;" v +arrnum bmore.c /^int arrnum = 0;$/;" v +arrnum bvi.c /^int arrnum = 0;$/;" v +as_fn_append config.status /^ as_fn_append ()$/;" f +as_fn_append configure /^ as_fn_append ()$/;" f +as_fn_arith config.status /^ as_fn_arith ()$/;" f +as_fn_arith configure /^ as_fn_arith ()$/;" f +as_fn_error config.status /^as_fn_error ()$/;" f +as_fn_error configure /^as_fn_error ()$/;" f +as_fn_exit config.status /^as_fn_exit ()$/;" f +as_fn_exit configure /^as_fn_exit ()$/;" f +as_fn_failure configure /^as_fn_failure () { as_fn_return 1; }$/;" f +as_fn_mkdir_p config.status /^as_fn_mkdir_p ()$/;" f +as_fn_mkdir_p configure /^as_fn_mkdir_p ()$/;" f +as_fn_ret_failure configure /^as_fn_ret_failure () { return 1; }$/;" f +as_fn_ret_success configure /^as_fn_ret_success () { return 0; }$/;" f +as_fn_set_status config.status /^as_fn_set_status ()$/;" f +as_fn_set_status configure /^as_fn_set_status ()$/;" f +as_fn_success configure /^as_fn_success () { as_fn_return 0; }$/;" f +as_fn_unset config.status /^as_fn_unset ()$/;" f +as_fn_unset configure /^as_fn_unset ()$/;" f +ascii_comp recomp.c /^ascii_comp(smem, pattern)$/;" f +ascii_flag bmore.c /^int ascii_flag = 0;$/;" v +attrset dosio.c /^attrset(int attr)$/;" f +backsearch re.c /^backsearch(start, mode)$/;" f +beep doscur.h 76;" d +bindir Makefile /^bindir = $(DESTDIR)${exec_prefix}\/bin$/;" m +block_begin bvi.c /^off_t block_begin, block_end, block_size;$/;" v +block_datum bvi.h /^} block_datum;$/;" t typeref:enum:_block_datum +block_end bvi.c /^off_t block_begin, block_end, block_size;$/;" v +block_flag bvi.c /^int block_flag = 0;$/;" v +block_read io.c /^static off_t block_read;$/;" v file: +block_size bvi.c /^off_t block_begin, block_end, block_size;$/;" v +bmbeep bmore.c /^bmbeep() {$/;" f +bmore_search_pat bmore.c /^char bmore_search_pat[BUFFER]; \/* \/ or ? command *\/$/;" v +bmregexec bmore.c /^bmregexec(scan)$/;" f +bmsearch bmore.c /^bmsearch(ch)$/;" f +bregexec re.c /^bregexec(start, scan)$/;" f +buf comm.c /^static struct stat buf;$/;" v typeref:struct:stat file: +buf dosio.c /^static struct stat buf;$/;" v typeref:struct:stat file: +buf io.c /^static struct stat buf;$/;" v typeref:struct:stat file: +buf set.c /^static char buf[64];$/;" v file: +buffer1 bmore.c /^char buffer1[MAXCMD], buffer2[MAXCMD];$/;" v +buffer2 bmore.c /^char buffer1[MAXCMD], buffer2[MAXCMD];$/;" v +bvi_init dosio.c /^bvi_init(char *dir)$/;" f +bvi_init io.c /^bvi_init(dir)$/;" f +bytepos bmore.c /^off_t bytepos, oldpos;$/;" v +c_argc comm.c /^static int c_argc = 0;$/;" v file: +c_argv comm.c /^static char *c_argv[9];$/;" v file: +c_flag bmore.c /^int c_flag = 0, d_flag = 0;$/;" v +calc_addr re.c /^calc_addr(pointer, def_addr)$/;" f +calc_size bvi.c /^calc_size(arg)$/;" f +cbreak doscur.h 136;" d +chk_comm comm.c /^chk_comm(flag)$/;" f +chtype doscur.h 58;" d +clear doscur.h 83;" d +clear_marks edit.c /^clear_marks()$/;" f +clear_sc bm_unix.c /^char *clear_sc; \/* clear screen *\/$/;" v +clearscreen bm_dos.c /^clearscreen()$/;" f +clearscreen bm_unix.c /^clearscreen()$/;" f +clearstr comm.c /^clearstr()$/;" f +cleartoeol bm_dos.c /^cleartoeol()$/;" f +cleartoeol bm_unix.c /^cleartoeol()$/;" f +clrtoeol doscur.h 79;" d +cmdbuf bmore.c /^static char cmdbuf[MAXCMD];$/;" v file: +cmdstr bvi.c /^char cmdstr[MAXCMD + 1] = "";$/;" v +cnt bmore.c /^static int cnt = 0;$/;" v file: +contrd edit.c /^char contrd[][4] = {"NUL", " ^A", " ^B", " ^C", " ^D", " ^E", " ^F", "BEL",$/;" v +contru edit.c /^char contru[][4] = {"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",$/;" v +copyright bmore.c /^char *copyright = "Copyright (C) 1990-2013 by Gerhard Buergmann";$/;" v +copyright bvi.c /^char *copyright = "Copyright (C) 1996-2013 by Gerhard Buergmann";$/;" v +corr bmore.c /^int corr = 0, do_header = 0, to_print;$/;" v +cur_back edit.c /^cur_back()$/;" f +cur_forw edit.c /^cur_forw(check)$/;" f +curfile bvi.c /^int curfile; \/* number of the current file *\/$/;" v +curpos bvi.c /^PTR curpos;$/;" v +curr_file bmore.c /^FILE *curr_file = NULL, *help_file;$/;" v +current bvi.c /^PTR current;$/;" v +current_start bvi.c /^PTR current_start;$/;" v +d_flag bmore.c /^int c_flag = 0, d_flag = 0;$/;" v +d_memcpy dosio.c /^d_memcpy(PTR dest, PTR src, off_t n)$/;" f +d_memmove dosio.c /^d_memmove(PTR dest, PTR src, off_t n)$/;" f +datarootdir Makefile /^datarootdir = ${prefix}\/share$/;" m +dbug bm_dos.c /^FILE *dbug;$/;" v +delch dosio.c /^delch()$/;" f +deleteln doscur.h 110;" d +dlines bm_unix.c /^int dum_opt, dlines;$/;" v +do_append bvi.c /^do_append(count, buf)$/;" f +do_back edit.c /^do_back(n, start)$/;" f +do_delete edit.c /^do_delete(n, start)$/;" f +do_exit comm.c /^do_exit()$/;" f +do_ft edit.c /^do_ft(ch, flag)$/;" f +do_header bmore.c /^int corr = 0, do_header = 0, to_print;$/;" v +do_ins_chg edit.c /^do_ins_chg(start, arg, mode)$/;" f +do_logic set.c /^do_logic(mode, str)$/;" f +do_mark edit.c /^do_mark(mark, addr)$/;" f +do_next bmore.c /^do_next(n)$/;" f +do_over bvi.c /^do_over(loc, n, buf)$/;" f +do_put bvi.c /^do_put(loc, n, buf)$/;" f +do_shell dosio.c /^do_shell()$/;" f +do_shell io.c /^do_shell()$/;" f +do_substitution re.c /^do_substitution(delim, line, startpos, endpos)$/;" f +do_tilde bvi.c /^do_tilde(count)$/;" f +do_undo bvi.c /^do_undo()$/;" f +do_z edit.c /^do_z(mode)$/;" f +docmdline comm.c /^docmdline(cmdline)$/;" f +doecmd comm.c /^doecmd(arg, force)$/;" f +doset set.c /^doset(arg)$/;" f +doshell bm_dos.c /^doshell(cmd)$/;" f +doshell bm_unix.c /^doshell(cmd)$/;" f +doupdate doscur.h 143;" d +dum_opt bm_unix.c /^int dum_opt, dlines;$/;" v +dup_print_flag bmore.c /^int dup_print_flag = 0;$/;" v +echo doscur.h 128;" d +edit edit.c /^edit(mode)$/;" f +edits bvi.c /^int edits = 0;$/;" v +emptyclass bmore.c /^char *emptyclass = "Empty byte class '[]' or '[^]'";$/;" v +emptyclass re.c /^char *emptyclass = "Bad character class|Empty byte class '[]' or '[^]' cannot match";$/;" v +emsg bmore.c /^emsg(s)$/;" f +emsg comm.c /^emsg(s)$/;" f +end_addr comm.c /^PTR end_addr;$/;" v +end_word re.c /^end_word(start)$/;" f +endwin doscur.h 137;" d +enlarge dosio.c /^enlarge(off_t add)$/;" f +enlarge io.c /^enlarge(add)$/;" f +env bvi.c /^jmp_buf env; \/* context for `longjmp' function *\/$/;" v +erase doscur.h 81;" d +erase_ln bm_unix.c /^char *erase_ln; \/* erase line *\/$/;" v +erasechar doscur.h 75;" d +estring bmore.c /^char estring[MAXCMD] = ""; \/* string for shell escape *\/$/;" v +exec_prefix Makefile /^exec_prefix = ${prefix}$/;" m +extra comm.c /^char *extra = "Extra chars|Extra characters at end of command";$/;" v +exval bmore.c /^int exval = 0;$/;" v +fbuf set.c /^static char fbuf[256];$/;" v file: +ffp set.c /^static FILE *ffp;$/;" v file: +file_nr bmore.c /^int file_nr = 0; \/* number of current input file *\/$/;" v +fileinfo edit.c /^fileinfo(fname)$/;" f +filemode dosio.c /^int filemode;$/;" v +filemode io.c /^int filemode;$/;" v +files bmore.c /^char **files; \/* list of input files *\/$/;" v +files bvi.c /^char **files; \/* list of input files *\/$/;" v +filesize bmore.c /^off_t screen_home, filesize;$/;" v +filesize bvi.c /^off_t filesize, memsize, undosize;$/;" v +flags set.h /^ int flags;$/;" m struct:param +flash doscur.h 77;" d +flushinp doscur.h 120;" d +fnum bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v +from_file set.c /^static int from_file = 0;$/;" v file: +fsearch re.c /^fsearch(start, end, smem)$/;" f +fsearch_end re.c /^fsearch_end(start, end, smem, s_end)$/;" f +fullname set.h /^ char *fullname; \/* full parameter name *\/$/;" m struct:param +getbegyx doscur.h 105;" d +getcbuff edit.c /^static char getcbuff[BUFFER];$/;" v file: +getch dosio.c /^getch()$/;" f +getcmdstr set.c /^getcmdstr(p, x)$/;" f +getcnext edit.c /^static char *getcnext = NULL;$/;" v file: +getmaxyx doscur.h 106;" d +getyx doscur.h 104;" d +got_int bm_dos.c /^int got_int;$/;" v +got_int bm_unix.c /^int got_int;$/;" v +help_file bmore.c /^FILE *curr_file = NULL, *help_file;$/;" v +helpdir Makefile /^helpdir = $(DESTDIR)${datarootdir}\/bvi$/;" m +helppath bmore.c /^char helppath[MAXCMD];$/;" v +hex_comp recomp.c /^hex_comp(smem, pattern)$/;" f +hexchar recomp.c /^hexchar()$/;" f +highlight bm_dos.c /^highlight()$/;" f +highlight bm_unix.c /^highlight()$/;" f +hl_spat edit.c /^long hl_spat = 0;$/;" v +home bm_dos.c /^home()$/;" f +home bm_unix.c /^home()$/;" f +icnt bmore.c /^static int icnt = 0;$/;" v file: +idlok doscur.h 141;" d +ignore_case recomp.c /^int ignore_case = 0;$/;" v +inch dosio.c /^inch()$/;" f +init_byte bmore.c /^off_t init_byte = 0;$/;" v +init_search bmore.c /^int init_search = 0;$/;" v +initscr doscur.h 73;" d +initterm bm_dos.c /^initterm()$/;" f +initterm bm_unix.c /^initterm()$/;" f +insch dosio.c /^insch(int c)$/;" f +insertln doscur.h 108;" d +jmpproc bvi.c /^jmpproc(sig)$/;" f +keypad doscur.h 133;" d +last_motion bvi.c /^PTR last_motion;$/;" v +last_search bmore.c /^off_t last_search = 0;$/;" v +libdir Makefile /^libdir = $(DESTDIR)${exec_prefix}\/lib$/;" m +linbuf edit.c /^char linbuf[16384];$/;" v +line bvi.c /^static char line[MAXCMD];$/;" v file: +lineout edit.c /^lineout()$/;" f +load dosio.c /^load(char *fname)$/;" f +load io.c /^load(fname)$/;" f +loc bvi.c /^int loc;$/;" v +magic recomp.c /^int magic = 1;$/;" v +main bmore.c /^main(argc, argv)$/;" f +main bvi.c /^main(argc, argv)$/;" f +man1dir Makefile /^man1dir = $(mandir)\/man1$/;" m +mandir Makefile /^mandir = $(DESTDIR)${datarootdir}\/man$/;" m +mark bvi.c /^static int mark;$/;" v file: +markbuf bvi.c /^PTR markbuf[26];$/;" v +maxpos bvi.c /^PTR maxpos;$/;" v +maxx bmore.c /^int maxx, maxy;$/;" v +maxx bvi.c /^int maxx, maxy, x, xx, y;$/;" v +maxy bmore.c /^int maxx, maxy;$/;" v +maxy bvi.c /^int maxx, maxy, x, xx, y;$/;" v +mem bvi.c /^PTR mem = NULL;$/;" v +memcpy bvi.h 123;" d +memmove bm_unix.c /^memmove(s1, s2, n)$/;" f +memmove bvi.h 124;" d +memmove io.c /^memmove(s1, s2, n)$/;" f +memsize bvi.c /^off_t filesize, memsize, undosize;$/;" v +morefiles comm.c /^char *morefiles = "more files@to edit";$/;" v +move doscur.h 91;" d +movebyte edit.c /^movebyte()$/;" f +msg comm.c /^msg(s)$/;" f +mvaddch doscur.h 93;" d +mvaddstr doscur.h 97;" d +mvgetch doscur.h 112;" d +mvgetstr doscur.h 115;" d +mvinch dosio.c /^mvinch(int y, int x)$/;" f +mvinsch doscur.h 125;" d +mvprintw doscur.h 101;" d +mvscanw doscur.h 122;" d +mvwaddch doscur.h 92;" d +mvwaddstr doscur.h 96;" d +mvwgetch doscur.h 111;" d +mvwgetstr doscur.h 114;" d +mvwprintw doscur.h 100;" d +mvwscanw doscur.h 121;" d +mymaxx bmore.c /^int mymaxx = 0, mymaxy = 0;$/;" v +mymaxy bmore.c /^int mymaxx = 0, mymaxy = 0;$/;" v +name bmore.c /^char *name = NULL;$/;" v +name bvi.c /^char *name = NULL;$/;" v +new_screen edit.c /^new_screen()$/;" f +newwin doscur.h 74;" d +nextchar bmore.c /^nextchar()$/;" f +nl doscur.h 131;" d +no_intty bm_dos.c /^int no_intty, no_tty;$/;" v +no_intty bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v +no_tty bm_dos.c /^int no_intty, no_tty;$/;" v +no_tty bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v +noaddr comm.c /^char *noaddr = "No address allowed@on this command";$/;" v +nobytes bvi.c /^char *nobytes = "No bytes@in the buffer";$/;" v +nodelay doscur.h 127;" d +noecho doscur.h 129;" d +nonl doscur.h 132;" d +noprev re.c /^char *noprev = "No previous expression";$/;" v +noraw doscur.h 139;" d +normal bm_dos.c /^normal()$/;" f +normal bm_unix.c /^normal()$/;" f +notfound re.c /^char *notfound = "Fail|Pattern not found";$/;" v +notimeout doscur.h 140;" d +noval comm.c /^char *noval = "No value@for binary operation";$/;" v +nowrtmsg comm.c /^char *nowrtmsg = "No write@since last change (:%s! overrides)";$/;" v +nstate bm_unix.c /^struct termios ostate, nstate;$/;" v typeref:struct: +numarr bmore.c /^char numarr[64]; \/* string for collecting number *\/$/;" v +numarr bvi.c /^char numarr[MAXCMD]; \/* string for collecting number *\/$/;" v +numfiles bmore.c /^int numfiles; \/* number of input files *\/$/;" v +numfiles bvi.c /^int numfiles; \/* number of input files *\/$/;" v +nvalue set.h /^ off_t nvalue;$/;" m struct:param +off_t bmore.h 105;" d +off_t bvi.h 119;" d +oldbuf comm.c /^static char oldbuf[CMDSZ]; \/** for :!! command **\/$/;" v file: +oldpos bmore.c /^off_t bytepos, oldpos;$/;" v +open_file bmore.c /^open_file(name)$/;" f +ostate bm_unix.c /^struct termios ostate, nstate;$/;" v typeref:struct:termios +out_len bmore.c /^int out_len;$/;" v +outmsg comm.c /^outmsg(s)$/;" f +pagepos bvi.c /^PTR pagepos;$/;" v +param set.h /^struct param {$/;" s +params set.c /^struct param params[] = {$/;" v typeref:struct:param +patcpy re.c /^patcpy(s1, s2, delim)$/;" f +pattern re.c /^char pattern[MAXCMD + 1];$/;" v +poi recomp.c /^char *poi;$/;" v +precount bmore.c /^long precount = -1; \/* number preceding command *\/$/;" v +precount bvi.c /^long precount = -1;$/;" v +prefix Makefile /^prefix = \/usr\/local$/;" m +printline edit.c /^printline(mempos, scpos)$/;" f +printout bmore.c /^printout(lns)$/;" f +printw doscur.h 103;" d +progname bmore.c /^static char progname[10];$/;" v file: +progname bvi.c /^static char progname[8];$/;" v file: +prompt bmore.c /^int prompt = 1;$/;" v +prototypes configure /^ function prototypes and stuff, but not '\\xHH' hex character constants.$/;" f +pushback bmore.c /^pushback(n, where)$/;" f +putchr bm_unix.c /^putchr(ch)$/;" f +putchr bm_unix.c /^putchr(char ch)$/;" f +putline bmore.c /^putline(buf, num)$/;" f +quit edit.c /^quit()$/;" f +range bvi.c /^range(ch)$/;" f +raw doscur.h 138;" d +rdline bmore.c /^rdline(ch, sstring)$/;" f +read_rc set.c /^read_rc(fn)$/;" f +refresh doscur.h 134;" d +rep_buf bvi.c /^char rep_buf[BUFFER];$/;" v +repaint edit.c /^repaint() \/***** redraw screen *********************\/$/;" f +repl_count comm.c /^int repl_count = -1;$/;" v +reset_tty bm_dos.c /^reset_tty ()$/;" f +reset_tty bm_unix.c /^reset_tty()$/;" f +resetty doscur.h 145;" d +rev_end bm_unix.c /^char *rev_start, *rev_end; \/* enter and exit standout mode *\/$/;" v +rev_start bm_unix.c /^char *rev_start, *rev_end; \/* enter and exit standout mode *\/$/;" v +rsearch re.c /^rsearch(start, end, smem)$/;" f +save dosio.c /^save(char *fname, PTR start, PTR end, int flags)$/;" f +save io.c /^save(fname, start, end, flags)$/;" f +save_chk comm.c /^save_chk(fname, start, end, flags)$/;" f +savetty doscur.h 144;" d +sbracket bmore.c /^sbracket(start, scan, count)$/;" f +sbracket re.c /^sbracket(start, scan, count)$/;" f file: +scanw doscur.h 124;" d +scr dosio.c /^struct WINDOW scr;$/;" v typeref:struct:WINDOW +screen bvi.c /^int screen, status;$/;" v +screen_home bmore.c /^off_t screen_home, filesize;$/;" v +scrolldown edit.c /^scrolldown(lns)$/;" f +scrollok doscur.h 142;" d +scrollup edit.c /^scrollup(lns)$/;" f +scrolly bvi.c /^static int scrolly;$/;" v file: +search_pat re.c /^char search_pat[BUFFER]; \/* \/ or ? command *\/$/;" v +searching re.c /^searching(ch, line, startpos, endpos, flag)$/;" f +set_tty bm_dos.c /^set_tty ()$/;" f +set_tty bm_unix.c /^set_tty()$/;" f +setcur edit.c /^setcur()$/;" f +setpage edit.c /^setpage(addr)$/;" f +shell bvi.c /^char *shell;$/;" v +shortname set.h /^ char *shortname; \/* permissible abbreviation *\/$/;" m struct:param +showparms set.c /^showparms(all)$/;" f +sig bm_dos.c /^sig()$/;" f +sig bm_unix.c /^sig(sig)$/;" f +size bvi.c /^off_t size;$/;" v +slow_tty bm_unix.c /^int fnum, no_intty, no_tty, slow_tty;$/;" v +smode bmore.c /^static int smode;$/;" v file: +smode recomp.c /^int smode;$/;" v +smsg comm.c /^smsg(s)$/;" f +spos bvi.c /^PTR spos;$/;" v +srcdir Makefile /^srcdir = .$/;" m +sstring bmore.c /^char sstring[MAXCMD] = ""; \/* string for search *\/$/;" v +standend doscur.h 89;" d +standout doscur.h 88;" d +start_addr comm.c /^PTR start_addr;$/;" v +statpos edit.c /^statpos()$/;" f +status bvi.c /^int screen, status;$/;" v +stdscr dosio.c /^int stdscr = 0;$/;" v +strcasecmp bmore.h 108;" d +strcasecmp bvi.h 122;" d +strdup io.c /^strdup(s)$/;" f +string bmore.c /^char string[MAXCMD];$/;" v +string bvi.c /^char string[MAXCMD];$/;" v +strncasecmp bmore.h 107;" d +strncasecmp bvi.h 121;" d +stty bm_unix.c 34;" d file: +stuffin edit.c /^stuffin(s)$/;" f +svalue set.h /^ char *svalue;$/;" m struct:param +sysemsg comm.c /^sysemsg(s)$/;" f +terminal dosio.c /^char *terminal = "ansi";$/;" v +terminal io.c /^char *terminal;$/;" v +tmpbuf edit.c /^char tmpbuf[10];$/;" v +to_print bmore.c /^int corr = 0, do_header = 0, to_print;$/;" v +toggle edit.c /^toggle()$/;" f +trunc_cur bvi.c /^trunc_cur()$/;" f +undo_buf bvi.c /^char *undo_buf = NULL;$/;" v +undo_count bvi.c /^off_t undo_count;$/;" v +undo_start bvi.c /^PTR undo_start;$/;" v +undosize bvi.c /^off_t filesize, memsize, undosize;$/;" v +usage bmore.c /^usage()$/;" f +usage bvi.c /^usage()$/;" f +vgetc bm_dos.c /^vgetc()$/;" f +vgetc bm_unix.c /^vgetc()$/;" f +vgetc edit.c /^vgetc()$/;" f +waddch doscur.h 94;" d +waddstr doscur.h 98;" d +wait_return comm.c /^wait_return(flag)$/;" f +wclear doscur.h 82;" d +wclrtoeol doscur.h 78;" d +wdeleteln doscur.h 109;" d +werase doscur.h 80;" d +wgetch doscur.h 113;" d +wgetstr doscur.h 116;" d +winsertln doscur.h 107;" d +wmove doscur.h 90;" d +wordsearch re.c /^wordsearch(start, mode)$/;" f +wprintw doscur.h 102;" d +wrefresh doscur.h 135;" d +wrstat bvi.c /^static int wrstat = 1;$/;" v file: +wscanw doscur.h 123;" d +x bvi.c /^int maxx, maxy, x, xx, y;$/;" v +xpos edit.c /^xpos()$/;" f +xx bvi.c /^int maxx, maxy, x, xx, y;$/;" v +y bvi.c /^int maxx, maxy, x, xx, y;$/;" v +yank_buf bvi.c /^char *yank_buf = NULL;$/;" v +yanked bvi.c /^off_t yanked = 0L;$/;" v +yd_addr comm.c /^yd_addr()$/;" f