diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.in | 16 | ||||
| -rw-r--r-- | USBLCD.c | 542 | ||||
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 356 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | display.c | 9 | ||||
| -rw-r--r-- | lcd4linux.conf.sample | 4 |
9 files changed, 765 insertions, 182 deletions
diff --git a/Makefile.am b/Makefile.am index 4e0c311..1ddc5eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,6 +36,9 @@ acconfig.h \ BeckmannEgle.c \ Crystalfontz.c Crystalfontz.h \ HD44780.c \ +M50530.c \ +T6963.c \ +USBLCD.c \ MatrixOrbital.c \ PalmPilot.c \ Raster.c \ diff --git a/Makefile.in b/Makefile.in index 496c674..9e278bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -81,7 +81,7 @@ lcd4linux_DEPENDENCIES = @DRIVERS@ lcd4linux_SOURCES = lcd4linux.c debug.c debug.h cfg.c cfg.h lock.c lock.h parser.c parser.h processor.c processor.h system.c system.h isdn.c isdn.h mail.c mail.h seti.c seti.h battery.c battery.h filter.c filter.h udelay.c udelay.h display.c display.h pixmap.c pixmap.h fontmap.c fontmap.h exec.c exec.h mail2.c socket.c socket.h -EXTRA_lcd4linux_SOURCES = acconfig.h BeckmannEgle.c Crystalfontz.c Crystalfontz.h HD44780.c MatrixOrbital.c PalmPilot.c Raster.c SIN.c Skeleton.c XWindow.c Text.c +EXTRA_lcd4linux_SOURCES = acconfig.h BeckmannEgle.c Crystalfontz.c Crystalfontz.h HD44780.c M50530.c T6963.c USBLCD.c MatrixOrbital.c PalmPilot.c Raster.c SIN.c Skeleton.c XWindow.c Text.c EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm CREDITS FAQ NEWS TODO README.Drivers README.MatrixOrbital README.HD44780 README.HD44780.GPO README.Crystalfontz README.X11 README.KDE README.Raster README.Png README.Webinterface README.Text @@ -118,13 +118,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP_ENV = --best DEP_FILES = .deps/BeckmannEgle.P .deps/Crystalfontz.P .deps/HD44780.P \ -.deps/MatrixOrbital.P .deps/PalmPilot.P .deps/Raster.P .deps/SIN.P \ -.deps/Skeleton.P .deps/Text.P .deps/XWindow.P .deps/battery.P \ -.deps/cfg.P .deps/debug.P .deps/display.P .deps/exec.P .deps/filter.P \ -.deps/fontmap.P .deps/isdn.P .deps/lcd4linux.P .deps/lock.P \ -.deps/mail.P .deps/mail2.P .deps/parser.P .deps/pixmap.P \ -.deps/processor.P .deps/seti.P .deps/socket.P .deps/system.P \ -.deps/udelay.P +.deps/M50530.P .deps/MatrixOrbital.P .deps/PalmPilot.P .deps/Raster.P \ +.deps/SIN.P .deps/Skeleton.P .deps/T6963.P .deps/Text.P .deps/USBLCD.P \ +.deps/XWindow.P .deps/battery.P .deps/cfg.P .deps/debug.P \ +.deps/display.P .deps/exec.P .deps/filter.P .deps/fontmap.P \ +.deps/isdn.P .deps/lcd4linux.P .deps/lock.P .deps/mail.P .deps/mail2.P \ +.deps/parser.P .deps/pixmap.P .deps/processor.P .deps/seti.P \ +.deps/socket.P .deps/system.P .deps/udelay.P SOURCES = $(lcd4linux_SOURCES) $(EXTRA_lcd4linux_SOURCES) OBJECTS = $(lcd4linux_OBJECTS) diff --git a/USBLCD.c b/USBLCD.c new file mode 100644 index 0000000..d559741 --- /dev/null +++ b/USBLCD.c @@ -0,0 +1,542 @@ +/* $Id: USBLCD.c,v 1.1 2002/08/17 13:10:22 reinelt Exp $ + * + * Driver for USBLCD ( see http://www.usblcd.de ) + * This Driver is based on HD44780.c + * + * Copyright 2002 by Robin Adams, Adams IT Services ( info@usblcd.de ) + * Copyright 1999, 2000 by Michael Reinelt (reinelt@eunet.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. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * + * Revision 1.0 2002/07/08 12:16:10 radams + * + * first version of the USBLCD driver + * + */ + +/* + * + * exported fuctions: + * + * struct LCD UDBLCD[] + * + */ + +#include "config.h" + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> +#include <fcntl.h> +#include <time.h> +#include <errno.h> +#include <string.h> +#include <unistd.h> +#include <sys/ioctl.h> +#include <sys/stat.h> + +#include "debug.h" +#include "cfg.h" +#include "display.h" +#include "udelay.h" + +#define GET_HARD_VERSION 1 +#define GET_DRV_VERSION 2 + +#define XRES 5 +#define YRES 8 +#define CHARS 8 +#define BARS ( BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2 ) + +typedef struct { + int len1; + int len2; + int type; + int segment; +} BAR; + +typedef struct { + int len1; + int len2; + int type; + int used; + int ascii; +} SEGMENT; + +static LCD Lcd; + +int usblcd_file; + +static char *Port=NULL; + + +static char Txt[4][40]; +static BAR Bar[4][40]; + +static int nSegment=2; +static SEGMENT Segment[128] = {{ len1:0, len2:0, type:255, used:0, ascii:32 }, + { len1:255, len2:255, type:255, used:0, ascii:255 }}; + + +static void USBLCD_command (unsigned char cmd, int delay) +{ + + { + char a=0; + write(usblcd_file,&a,1); + write(usblcd_file,&cmd,1); + } +} + +static void USBLCD_write (char *string, int len, int delay) +{ + { + char a; + while (len--) { + a=*string++; + + if(a==0) write(usblcd_file,&a,1); + write(usblcd_file,&a,1); + } + } +} + + +static int USBLCD_open (void) +{ + char buf[128]; + int major,minor; + + usblcd_file=open(Port,O_WRONLY); + if (usblcd_file==-1) { + error ("USBLCD: open(%s) failed: %s", Port, strerror(errno)); + return -1; + } + + memset(buf,0,128); + + if( ioctl(usblcd_file,GET_DRV_VERSION, buf)!=0) { + error ("IOCTL failed, could not get Driver Version!\n"); + return -2; + } ; + + debug("Driver Version: %s\n",buf); + + if( sscanf(buf,"USBLCD Driver Version %d.%d",&major,&minor)!=2) { + error("Could not read Driver Version!\n"); + return -4; + }; + + if(major!=1) { + error("Driver Version not supported!\n"); + return -4; + } + + memset(buf,0,128); + + if( ioctl(usblcd_file,GET_HARD_VERSION, buf)!=0) { + error ("IOCTL failed, could not get Hardware Version!\n"); + return -3; + } ; + + debug("Hardware Version: %s\n\n",buf); + + if( sscanf(buf,"%d.%d",&major,&minor)!=2) { + error("Could not read Hardware Version!\n"); + return -4; + }; + + if(major!=1) { + error("Hardware Version not supported!\n"); + return -4; + } + + USBLCD_command (0x29, 40); // 8 Bit mode, 1/16 duty cycle, 5x8 font + USBLCD_command (0x08, 40); // Display off, cursor off, blink off + USBLCD_command (0x0c, 1640); // Display on, cursor off, blink off, wait 1.64 ms + USBLCD_command (0x06, 40); // curser moves to right, no shift + + return 0; +} + +static void USBLCD_process_bars (void) +{ + int row, col; + int i, j; + + for (i=2; i<nSegment && Segment[i].used; i++); + for (j=i+1; j<nSegment; j++) { + if (Segment[j].used) + Segment[i++]=Segment[j]; + } + nSegment=i; + + for (row=0; row<Lcd.rows; row++) { + for (col=0; col<Lcd.cols; col++) { + if (Bar[row][col].type==0) continue; + for (i=0; i<nSegment; i++) { + if (Segment[i].type & Bar[row][col].type && + Segment[i].len1== Bar[row][col].len1 && + Segment[i].len2== Bar[row][col].len2) break; + } + if (i==nSegment) { + nSegment++; + Segment[i].len1=Bar[row][col].len1; + Segment[i].len2=Bar[row][col].len2; + Segment[i].type=Bar[row][col].type; + Segment[i].used=0; + Segment[i].ascii=-1; + } + Bar[row][col].segment=i; + } + } +} + +static int USBLCD_segment_diff (int i, int j) +{ + int RES; + int i1, i2, j1, j2; + + if (i==j) return 65535; + if (!(Segment[i].type & Segment[j].type)) return 65535; + if (Segment[i].len1==0 && Segment[j].len1!=0) return 65535; + if (Segment[i].len2==0 && Segment[j].len2!=0) return 65535; + RES=Segment[i].type & BAR_H ? XRES:YRES; + if (Segment[i].len1>=RES && Segment[j].len1<RES) return 65535; + if (Segment[i].len2>=RES && Segment[j].len2<RES) return 65535; + if (Segment[i].len1==Segment[i].len2 && Segment[j].len1!=Segment[j].len2) return 65535; + + i1=Segment[i].len1; if (i1>RES) i1=RES; + i2=Segment[i].len2; if (i2>RES) i2=RES; + j1=Segment[j].len1; if (j1>RES) i1=RES; + j2=Segment[j].len2; if (j2>RES) i2=RES; + + return (i1-i2)*(i1-i2)+(j1-j2)*(j1-j2); +} + +static void USBLCD_compact_bars (void) +{ + int i, j, r, c, min; + int pack_i, pack_j; + int pass1=1; + int deviation[nSegment][nSegment]; + + if (nSegment>CHARS+2) { + + for (i=2; i<nSegment; i++) { + for (j=0; j<nSegment; j++) { + deviation[i][j]=USBLCD_segment_diff(i,j); + } + } + + while (nSegment>CHARS+2) { + min=65535; + pack_i=-1; + pack_j=-1; + for (i=2; i<nSegment; i++) { + if (pass1 && Segment[i].used) continue; + for (j=0; j<nSegment; j++) { + if (deviation[i][j]<min) { + min=deviation[i][j]; + pack_i=i; + pack_j=j; + } + } + } + if (pack_i==-1) { + if (pass1) { + pass1=0; + continue; + } else { + error ("USBLCD: unable to compact bar characters"); + nSegment=CHARS; + break; + } + } + + nSegment--; + Segment[pack_i]=Segment[nSegment]; + + for (i=0; i<nSegment; i++) { + deviation[pack_i][i]=deviation[nSegment][i]; + deviation[i][pack_i]=deviation[i][nSegment]; + } + + for (r=0; r<Lcd.rows; r++) { + for (c=0; c<Lcd.cols; c++) { + if (Bar[r][c].segment==pack_i) + Bar[r][c].segment=pack_j; + if (Bar[r][c].segment==nSegment) + Bar[r][c].segment=pack_i; + } + } + } + } +} + +static void USBLCD_define_chars (void) +{ + int c, i, j; + char buffer[8]; + + for (i=2; i<nSegment; i++) { + if (Segment[i].used) continue; + if (Segment[i].ascii!=-1) continue; + for (c=0; c<CHARS; c++) { + for (j=2; j<nSegment; j++) { + if (Segment[j].ascii==c) break; + } + if (j==nSegment) break; + } + Segment[i].ascii=c; + switch (Segment[i].type) { + case BAR_L: + for (j=0; j<4; j++) { + char Pixel[] = { 0, 1, 3, 7, 15, 31 }; + buffer[j]=Pixel[Segment[i].len1]; + buffer[j+4]=Pixel[Segment[i].len2]; + } + break; + case BAR_R: + for (j=0; j<4; j++) { + char Pixel[] = { 0, 16, 24, 28, 30, 31 }; + buffer[j]=Pixel[Segment[i].len1]; + buffer[j+4]=Pixel[Segment[i].len2]; + } + break; + case BAR_U: + for (j=0; j<Segment[i].len1; j++) { + buffer[7-j]=31; + } + for (; j<YRES; j++) { + buffer[7-j]=0; + } + break; + case BAR_D: + for (j=0; j<Segment[i].len1; j++) { + buffer[j]=31; + } + for (; j<YRES; j++) { + buffer[j]=0; + } + break; + } + USBLCD_command (0x40|8*c, 40); + USBLCD_write (buffer, 8, 120); // 120 usec delay for CG RAM write + } +} + +int USBLCD_clear (void) +{ + int row, col; + + for (row=0; row<Lcd.rows; row++) { + for (col=0; col<Lcd.cols; col++) { + Txt[row][col]='\t'; + Bar[row][col].len1=-1; + Bar[row][col].len2=-1; + Bar[row][col].type=0; + Bar[row][col].segment=-1; + } + } + USBLCD_command (0x01, 1640); // clear display + return 0; +} + +int USBLCD_init (LCD *Self) +{ + int rows=-1, cols=-1 ; + char *port,*s ; + + if (Port) { + free(Port); + Port=NULL; + } + if ((port=cfg_get("Port"))==NULL || *port=='\0') { + error ("USBLCD: no 'Port' entry in %s", cfg_file()); + return -1; + } + if (port[0]=='/') Port=strdup(port); + else { + Port=(char *)malloc(5/*/dev/ */+strlen(port)+1); + sprintf(Port,"/dev/%s",port); + } + + debug ("USBLCD using device %s ", Port); + + s=cfg_get("Size"); + if (s==NULL || *s=='\0') { + error ("USBLCD: no 'Size' entry in %s", cfg_file()); + return -1; + } + if (sscanf(s,"%dx%d",&cols,&rows)!=2 || rows<1 || cols<1) { + error ("USBLCD: bad size '%s'",s); + return -1; + } + + Self->rows=rows; + Self->cols=cols; + Lcd=*Self; + + if (USBLCD_open()!=0) + return -1; + + USBLCD_clear(); + + return 0; +} + +void USBLCD_goto (int row, int col) +{ + int pos; + + pos=(row%2)*64+(row/2)*20+col; + USBLCD_command (0x80|pos, 40); +} + +int USBLCD_put (int row, int col, char *text) +{ + char *p=&Txt[row][col]; + char *t=text; + + while (*t && col++<=Lcd.cols) { + *p++=*t++; + } + return 0; +} + +int USBLCD_bar (int type, int row, int col, int max, int len1, int len2) +{ + int rev=0; + + if (len1<1) len1=1; + else if (len1>max) len1=max; + + if (len2<1) len2=1; + else if (len2>max) len2=max; + + switch (type) { + case BAR_L: + len1=max-len1; + len2=max-len2; + rev=1; + + case BAR_R: + while (max>0 && col<=Lcd.cols) { + Bar[row][col].type=type; + Bar[row][col].segment=-1; + if (len1>=XRES) { + Bar[row][col].len1=rev?0:XRES; + len1-=XRES; + } else { + Bar[row][col].len1=rev?XRES-len1:len1; + len1=0; + } + if (len2>=XRES) { + Bar[row][col].len2=rev?0:XRES; + len2-=XRES; + } else { + Bar[row][col].len2=rev?XRES-len2:len2; + len2=0; + } + max-=XRES; + col++; + } + break; + + case BAR_U: + len1=max-len1; + len2=max-len2; + rev=1; + + case BAR_D: + while (max>0 && row<=Lcd.rows) { + Bar[row][col].type=type; + Bar[row][col].segment=-1; + if (len1>=YRES) { + Bar[row][col].len1=rev?0:YRES; + len1-=YRES; + } else { + Bar[row][col].len1=rev?YRES-len1:len1; + len1=0; + } + if (len2>=YRES) { + Bar[row][col].len2=rev?0:YRES; + len2-=YRES; + } else { + Bar[row][col].len2=rev?YRES-len2:len2; + len2=0; + } + max-=YRES; + row++; + } + break; + + } + return 0; +} + +int USBLCD_flush (void) +{ + char buffer[256]; + char *p; + int s, row, col; + + USBLCD_process_bars(); + USBLCD_compact_bars(); + USBLCD_define_chars(); + + for (s=0; s<nSegment; s++) { + Segment[s].used=0; + } + + for (row=0; row<Lcd.rows; row++) { + for (col=0; col<Lcd.cols; col++) { + s=Bar[row][col].segment; + if (s!=-1) { + Segment[s].used=1; + Txt[row][col]=Segment[s].ascii; + } + } + for (col=0; col<Lcd.cols; col++) { + if (Txt[row][col]=='\t') continue; + USBLCD_goto (row, col); + for (p=buffer; col<Lcd.cols; col++, p++) { + if (Txt[row][col]=='\t') break; + *p=Txt[row][col]; + } + USBLCD_write (buffer, p-buffer, 40); // 40 usec delay for write + } + } + + + return 0; +} + +int USBLCD_quit (void) +{ + debug ("closing port %s", Port); + close(usblcd_file); + exit(0); + + return 0; +} + +LCD USBLCD[] = { + { "USBLCD",0,0,XRES,YRES,BARS,0,USBLCD_init,USBLCD_clear,USBLCD_put,USBLCD_bar,NULL,USBLCD_flush,USBLCD_quit }, + { NULL } +}; @@ -13,6 +13,9 @@ /* Define if you want the T6963 driver compiled */ #undef WITH_T6963 +/* Define if you want the USBLCD driver compiled */ +#undef WITH_USBLCD + /* Define if you want the Matrix Orbital driver compiled */ #undef WITH_MATRIXORBITAL diff --git a/config.h.in b/config.h.in index a7516ee..430da26 100644 --- a/config.h.in +++ b/config.h.in @@ -14,6 +14,9 @@ /* Define if you want the T6963 driver compiled */ #undef WITH_T6963 +/* Define if you want the USBLCD driver compiled */ +#undef WITH_USBLCD + /* Define if you want the Matrix Orbital driver compiled */ #undef WITH_MATRIXORBITAL @@ -685,7 +685,7 @@ Optional Packages: (try 'all,\!<driver>' if your shell complains...) possible drivers are: BeckmannEgle, CrystalFontz, HD44780, M50530, T6963 - MatrixOrbital, PalmPilot, PNG, PPM, X11, Text + USBLCD, MatrixOrbital, PalmPilot, PNG, PPM, X11, Text Some influential environment variables: CC C compiler command @@ -3862,6 +3862,7 @@ for driver in $drivers; do HD44780="yes" M50530="yes" T6963="yes" + USBLCD="yes" MATRIXORBITAL="yes" PALMPILOT="yes" PNG="yes" @@ -3884,6 +3885,9 @@ for driver in $drivers; do T6963) T6963=$val ;; + USBLCD) + USBLCD=$val + ;; MatrixOrbital) MATRIXORBITAL=$val ;; @@ -3909,14 +3913,14 @@ for driver in $drivers; do X11=$val ;; *) - { { echo "$as_me:3912: error: Unknown driver '$driver'" >&5 + { { echo "$as_me:3916: error: Unknown driver '$driver'" >&5 echo "$as_me: error: Unknown driver '$driver'" >&2;} { (exit 1); exit 1; }; } ;; esac done -echo "$as_me:3919: result: done" >&5 +echo "$as_me:3923: result: done" >&5 echo "${ECHO_T}done" >&6 RASTER="no" @@ -3961,6 +3965,14 @@ EOF fi +if test "$USBLCD" = "yes"; then + DRIVERS="$DRIVERS USBLCD.o" + cat >>confdefs.h <<\EOF +#define WITH_USBLCD 1 +EOF + +fi + if test "$MATRIXORBITAL" = "yes"; then DRIVERS="$DRIVERS MatrixOrbital.o" cat >>confdefs.h <<\EOF @@ -4020,14 +4032,14 @@ if test "$TEXT" = "yes"; then EOF else - { echo "$as_me:4023: WARNING: curses not found: Text driver disabled" >&5 + { echo "$as_me:4035: WARNING: curses not found: Text driver disabled" >&5 echo "$as_me: WARNING: curses not found: Text driver disabled" >&2;} fi fi if test "$X11" = "yes"; then if test "$no_x" = "yes"; then - { { echo "$as_me:4030: error: X11 headers or libraries not available: X11 driver disabled" >&5 + { { echo "$as_me:4042: error: X11 headers or libraries not available: X11 driver disabled" >&5 echo "$as_me: error: X11 headers or libraries not available: X11 driver disabled" >&2;} { (exit 1); exit 1; }; } else @@ -4045,18 +4057,18 @@ if test "$RASTER" = "yes"; then fi if test "$DRIVERS" = ""; then - { { echo "$as_me:4048: error: You should include at least one driver..." >&5 + { { echo "$as_me:4060: error: You should include at least one driver..." >&5 echo "$as_me: error: You should include at least one driver..." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:4053: checking for ANSI C header files" >&5 +echo "$as_me:4065: 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 else cat >conftest.$ac_ext <<_ACEOF -#line 4059 "configure" +#line 4071 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -4064,13 +4076,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:4067: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4079: \"$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:4073: \$? = $ac_status" >&5 + echo "$as_me:4085: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4092,7 +4104,7 @@ rm -f conftest.err 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 4095 "configure" +#line 4107 "configure" #include "confdefs.h" #include <string.h> @@ -4110,7 +4122,7 @@ 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 4113 "configure" +#line 4125 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4131,7 +4143,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 4134 "configure" +#line 4146 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -4157,15 +4169,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4160: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4172: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4163: \$? = $ac_status" >&5 + echo "$as_me:4175: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4165: \"$ac_try\"") >&5 + { (eval echo "$as_me:4177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4168: \$? = $ac_status" >&5 + echo "$as_me:4180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4178,7 +4190,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:4181: result: $ac_cv_header_stdc" >&5 +echo "$as_me:4193: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -4191,13 +4203,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:4194: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:4206: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $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 4200 "configure" +#line 4212 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -4212,16 +4224,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4215: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4227: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4218: \$? = $ac_status" >&5 + echo "$as_me:4230: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4221: \"$ac_try\"") >&5 + { (eval echo "$as_me:4233: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4224: \$? = $ac_status" >&5 + echo "$as_me:4236: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -4231,7 +4243,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4234: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4246: 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 <<EOF @@ -4244,7 +4256,7 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:4247: checking for opendir in -ldir" >&5 + echo "$as_me:4259: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4252,7 +4264,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4255 "configure" +#line 4267 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4271,16 +4283,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4274: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4286: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4277: \$? = $ac_status" >&5 + echo "$as_me:4289: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4280: \"$ac_try\"") >&5 + { (eval echo "$as_me:4292: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4283: \$? = $ac_status" >&5 + echo "$as_me:4295: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -4291,14 +4303,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4294: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:4306: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:4301: checking for opendir in -lx" >&5 + echo "$as_me:4313: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4306,7 +4318,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4309 "configure" +#line 4321 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4325,16 +4337,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4328: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4340: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4331: \$? = $ac_status" >&5 + echo "$as_me:4343: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4334: \"$ac_try\"") >&5 + { (eval echo "$as_me:4346: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4337: \$? = $ac_status" >&5 + echo "$as_me:4349: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -4345,7 +4357,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4348: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:4360: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" @@ -4353,13 +4365,13 @@ fi fi -echo "$as_me:4356: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "$as_me:4368: checking for sys/wait.h that is POSIX.1 compatible" >&5 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4362 "configure" +#line 4374 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -4381,16 +4393,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4384: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4396: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4387: \$? = $ac_status" >&5 + echo "$as_me:4399: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4390: \"$ac_try\"") >&5 + { (eval echo "$as_me:4402: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4393: \$? = $ac_status" >&5 + echo "$as_me:4405: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_sys_wait_h=yes else @@ -4400,7 +4412,7 @@ ac_cv_header_sys_wait_h=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4403: result: $ac_cv_header_sys_wait_h" >&5 +echo "$as_me:4415: result: $ac_cv_header_sys_wait_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 if test $ac_cv_header_sys_wait_h = yes; then @@ -4413,23 +4425,23 @@ fi for ac_header in fcntl.h limits.h strings.h sys/ioctl.h sys/time.h syslog.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4416: checking for $ac_header" >&5 +echo "$as_me:4428: 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 4422 "configure" +#line 4434 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4426: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4438: \"$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:4432: \$? = $ac_status" >&5 + echo "$as_me:4444: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4448,7 +4460,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4451: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4463: 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 <<EOF @@ -4461,23 +4473,23 @@ done for ac_header in sys/io.h asm/io.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4464: checking for $ac_header" >&5 +echo "$as_me:4476: 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 4470 "configure" +#line 4482 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4474: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4486: \"$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:4480: \$? = $ac_status" >&5 + echo "$as_me:4492: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4496,7 +4508,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4499: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4511: 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 <<EOF @@ -4509,23 +4521,23 @@ done for ac_header in linux/parport.h linux/ppdev.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4512: checking for $ac_header" >&5 +echo "$as_me:4524: 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 4518 "configure" +#line 4530 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4522: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4534: \"$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:4528: \$? = $ac_status" >&5 + echo "$as_me:4540: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4544,7 +4556,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4547: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4559: 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 <<EOF @@ -4557,23 +4569,23 @@ done for ac_header in gd/gd.h gd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4560: checking for $ac_header" >&5 +echo "$as_me:4572: 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 4566 "configure" +#line 4578 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4570: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4582: \"$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:4576: \$? = $ac_status" >&5 + echo "$as_me:4588: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4592,7 +4604,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4595: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4607: 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 <<EOF @@ -4605,23 +4617,23 @@ done for ac_header in net/if_ppp.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4608: checking for $ac_header" >&5 +echo "$as_me:4620: 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 4614 "configure" +#line 4626 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4618: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4630: \"$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:4624: \$? = $ac_status" >&5 + echo "$as_me:4636: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4640,7 +4652,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4643: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4655: 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 <<EOF @@ -4653,23 +4665,23 @@ done for ac_header in asm/msr.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4656: checking for $ac_header" >&5 +echo "$as_me:4668: 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 4662 "configure" +#line 4674 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4666: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4678: \"$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:4672: \$? = $ac_status" >&5 + echo "$as_me:4684: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4688,7 +4700,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4691: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4703: 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 <<EOF @@ -4698,7 +4710,7 @@ EOF fi done -echo "$as_me:4701: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:4713: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4706,7 +4718,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 4709 "configure" +#line 4721 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -4755,16 +4767,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:4758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4770: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4761: \$? = $ac_status" >&5 + echo "$as_me:4773: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4764: \"$ac_try\"") >&5 + { (eval echo "$as_me:4776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4767: \$? = $ac_status" >&5 + echo "$as_me:4779: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -4781,21 +4793,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:4784: result: none needed" >&5 + echo "$as_me:4796: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:4787: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:4799: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:4792: checking for an ANSI C-conforming const" >&5 +echo "$as_me:4804: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4798 "configure" +#line 4810 "configure" #include "confdefs.h" int @@ -4853,16 +4865,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4856: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4868: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4859: \$? = $ac_status" >&5 + echo "$as_me:4871: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4862: \"$ac_try\"") >&5 + { (eval echo "$as_me:4874: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4865: \$? = $ac_status" >&5 + echo "$as_me:4877: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -4872,7 +4884,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4875: result: $ac_cv_c_const" >&5 +echo "$as_me:4887: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -4882,7 +4894,7 @@ EOF fi -echo "$as_me:4885: checking for inline" >&5 +echo "$as_me:4897: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4890,7 +4902,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 4893 "configure" +#line 4905 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -4899,16 +4911,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4902: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4914: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4905: \$? = $ac_status" >&5 + echo "$as_me:4917: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4908: \"$ac_try\"") >&5 + { (eval echo "$as_me:4920: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4911: \$? = $ac_status" >&5 + echo "$as_me:4923: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -4919,7 +4931,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4922: result: $ac_cv_c_inline" >&5 +echo "$as_me:4934: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -4940,28 +4952,28 @@ 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:4943: checking for $ac_header" >&5 +echo "$as_me:4955: 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 4949 "configure" +#line 4961 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4955: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4967: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4958: \$? = $ac_status" >&5 + echo "$as_me:4970: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4961: \"$ac_try\"") >&5 + { (eval echo "$as_me:4973: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4964: \$? = $ac_status" >&5 + echo "$as_me:4976: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -4971,7 +4983,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4974: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4986: 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 <<EOF @@ -4981,13 +4993,13 @@ EOF fi done -echo "$as_me:4984: checking for pid_t" >&5 +echo "$as_me:4996: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4990 "configure" +#line 5002 "configure" #include "confdefs.h" $ac_includes_default int @@ -5002,16 +5014,16 @@ if (sizeof (pid_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5005: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5017: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5008: \$? = $ac_status" >&5 + echo "$as_me:5020: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5011: \"$ac_try\"") >&5 + { (eval echo "$as_me:5023: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5014: \$? = $ac_status" >&5 + echo "$as_me:5026: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -5021,7 +5033,7 @@ ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5024: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:5036: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test $ac_cv_type_pid_t = yes; then : @@ -5033,13 +5045,13 @@ EOF fi -echo "$as_me:5036: checking for size_t" >&5 +echo "$as_me:5048: 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 5042 "configure" +#line 5054 "configure" #include "confdefs.h" $ac_includes_default int @@ -5054,16 +5066,16 @@ if (sizeof (size_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5057: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5069: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5060: \$? = $ac_status" >&5 + echo "$as_me:5072: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5063: \"$ac_try\"") >&5 + { (eval echo "$as_me:5075: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5066: \$? = $ac_status" >&5 + echo "$as_me:5078: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_size_t=yes else @@ -5073,7 +5085,7 @@ ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5076: result: $ac_cv_type_size_t" >&5 +echo "$as_me:5088: 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 : @@ -5085,13 +5097,13 @@ EOF fi -echo "$as_me:5088: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:5100: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5094 "configure" +#line 5106 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -5107,16 +5119,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5110: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5122: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5113: \$? = $ac_status" >&5 + echo "$as_me:5125: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5116: \"$ac_try\"") >&5 + { (eval echo "$as_me:5128: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5119: \$? = $ac_status" >&5 + echo "$as_me:5131: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -5126,7 +5138,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5129: result: $ac_cv_header_time" >&5 +echo "$as_me:5141: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -5136,13 +5148,13 @@ EOF fi -echo "$as_me:5139: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "$as_me:5151: checking whether struct tm is in sys/time.h or time.h" >&5 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 if test "${ac_cv_struct_tm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5145 "configure" +#line 5157 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -5156,16 +5168,16 @@ struct tm *tp; tp->tm_sec; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5159: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5171: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5162: \$? = $ac_status" >&5 + echo "$as_me:5174: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5165: \"$ac_try\"") >&5 + { (eval echo "$as_me:5177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5168: \$? = $ac_status" >&5 + echo "$as_me:5180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_struct_tm=time.h else @@ -5175,7 +5187,7 @@ ac_cv_struct_tm=sys/time.h fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5178: result: $ac_cv_struct_tm" >&5 +echo "$as_me:5190: result: $ac_cv_struct_tm" >&5 echo "${ECHO_T}$ac_cv_struct_tm" >&6 if test $ac_cv_struct_tm = sys/time.h; then @@ -5185,13 +5197,13 @@ EOF fi -echo "$as_me:5188: checking for uid_t in sys/types.h" >&5 +echo "$as_me:5200: checking for uid_t in sys/types.h" >&5 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5194 "configure" +#line 5206 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5205,7 +5217,7 @@ fi rm -f conftest* fi -echo "$as_me:5208: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:5220: result: $ac_cv_type_uid_t" >&5 echo "${ECHO_T}$ac_cv_type_uid_t" >&6 if test $ac_cv_type_uid_t = no; then @@ -5220,14 +5232,14 @@ EOF fi if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:5223: checking whether $CC needs -traditional" >&5 + echo "$as_me:5235: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >conftest.$ac_ext <<_ACEOF -#line 5230 "configure" +#line 5242 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -5242,7 +5254,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 5245 "configure" +#line 5257 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -5255,14 +5267,14 @@ rm -f conftest* fi fi -echo "$as_me:5258: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:5270: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:5265: checking for working memcmp" >&5 +echo "$as_me:5277: checking for working memcmp" >&5 echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 if test "${ac_cv_func_memcmp_working+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5271,7 +5283,7 @@ else ac_cv_func_memcmp_working=no else cat >conftest.$ac_ext <<_ACEOF -#line 5274 "configure" +#line 5286 "configure" #include "confdefs.h" int @@ -5307,15 +5319,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5310: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5322: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5313: \$? = $ac_status" >&5 + echo "$as_me:5325: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5315: \"$ac_try\"") >&5 + { (eval echo "$as_me:5327: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5318: \$? = $ac_status" >&5 + echo "$as_me:5330: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_memcmp_working=yes else @@ -5327,17 +5339,17 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:5330: result: $ac_cv_func_memcmp_working" >&5 +echo "$as_me:5342: result: $ac_cv_func_memcmp_working" >&5 echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6 test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext" -echo "$as_me:5334: checking return type of signal handlers" >&5 +echo "$as_me:5346: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5340 "configure" +#line 5352 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -5359,16 +5371,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5362: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5374: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5365: \$? = $ac_status" >&5 + echo "$as_me:5377: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5368: \"$ac_try\"") >&5 + { (eval echo "$as_me:5380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5371: \$? = $ac_status" >&5 + echo "$as_me:5383: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -5378,7 +5390,7 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5381: result: $ac_cv_type_signal" >&5 +echo "$as_me:5393: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <<EOF @@ -5388,13 +5400,13 @@ EOF for ac_func in gettimeofday putenv select socket strdup strerror strstr strtol uname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5391: checking for $ac_func" >&5 +echo "$as_me:5403: 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 else cat >conftest.$ac_ext <<_ACEOF -#line 5397 "configure" +#line 5409 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5425,16 +5437,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5428: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5440: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5431: \$? = $ac_status" >&5 + echo "$as_me:5443: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5434: \"$ac_try\"") >&5 + { (eval echo "$as_me:5446: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5437: \$? = $ac_status" >&5 + echo "$as_me:5449: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5444,7 +5456,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5447: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5459: 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 <<EOF @@ -5534,7 +5546,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:5537: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:5549: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -5710,7 +5722,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:5713: error: ambiguous option: $1 + { { echo "$as_me:5725: 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;} @@ -5729,7 +5741,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:5732: error: unrecognized option: $1 + -*) { { echo "$as_me:5744: 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;} @@ -5774,7 +5786,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:5777: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:5789: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -6000,7 +6012,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:6003: creating $ac_file" >&5 + { echo "$as_me:6015: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -6018,7 +6030,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:6021: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:6033: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -6031,7 +6043,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:6034: error: cannot find input file: $f" >&5 + { { echo "$as_me:6046: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -6092,7 +6104,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:6095: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:6107: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -6103,7 +6115,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:6106: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:6118: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -6116,7 +6128,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:6119: error: cannot find input file: $f" >&5 + { { echo "$as_me:6131: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -6233,7 +6245,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:6236: $ac_file is unchanged" >&5 + { echo "$as_me:6248: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.in b/configure.in index 35d967d..a668fa1 100644 --- a/configure.in +++ b/configure.in @@ -30,7 +30,7 @@ AC_ARG_WITH( [ (try 'all,\!<driver>' if your shell complains...)] [ possible drivers are:] [ BeckmannEgle, CrystalFontz, HD44780, M50530, T6963] - [ MatrixOrbital, PalmPilot, PNG, PPM, X11, Text], + [ USBLCD, MatrixOrbital, PalmPilot, PNG, PPM, X11, Text], drivers=$withval, drivers=all ) @@ -56,6 +56,7 @@ for driver in $drivers; do HD44780="yes" M50530="yes" T6963="yes" + USBLCD="yes" MATRIXORBITAL="yes" PALMPILOT="yes" PNG="yes" @@ -78,6 +79,9 @@ for driver in $drivers; do T6963) T6963=$val ;; + USBLCD) + USBLCD=$val + ;; MatrixOrbital) MATRIXORBITAL=$val ;; @@ -137,6 +141,11 @@ if test "$T6963" = "yes"; then AC_DEFINE(WITH_T6963) fi +if test "$USBLCD" = "yes"; then + DRIVERS="$DRIVERS USBLCD.o" + AC_DEFINE(WITH_USBLCD) +fi + if test "$MATRIXORBITAL" = "yes"; then DRIVERS="$DRIVERS MatrixOrbital.o" AC_DEFINE(WITH_MATRIXORBITAL) @@ -1,4 +1,4 @@ -/* $Id: display.c,v 1.30 2002/04/29 11:00:28 reinelt Exp $ +/* $Id: display.c,v 1.31 2002/08/17 13:10:23 reinelt Exp $ * * framework for device drivers * @@ -20,6 +20,9 @@ * * * $Log: display.c,v $ + * Revision 1.31 2002/08/17 13:10:23 reinelt + * USBLCD driver added + * * Revision 1.30 2002/04/29 11:00:28 reinelt * * added Toshiba T6963 driver @@ -194,6 +197,7 @@ extern LCD Crystalfontz[]; extern LCD HD44780[]; extern LCD M50530[]; extern LCD T6963[]; +extern LCD USBLCD[]; extern LCD MatrixOrbital[]; extern LCD PalmPilot[]; extern LCD Raster[]; @@ -218,6 +222,9 @@ FAMILY Driver[] = { #ifdef WITH_T6963 { "T6963 based", T6963 }, #endif +#ifdef WITH_USBLCD + { "USBLCD", USBLCD }, +#endif #ifdef WITH_MATRIXORBITAL { "Matrix Orbital", MatrixOrbital }, #endif diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample index b083c91..62c0a62 100644 --- a/lcd4linux.conf.sample +++ b/lcd4linux.conf.sample @@ -13,6 +13,10 @@ Size 24x2 #Port /dev/ttyS2 #Type 20x4 +#Display USBLCD +#Port /dev/usb/usblcd +#Size 20x4 + #Display PalmPilot #Port /dev/ttyS2 #Speed 4800 |