lwatch-cvs Mailing List for Log Watcher (Page 6)
Brought to you by:
arturcz
Menu
▾
▴
lwatch-cvs — lwatch CVS commit log
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(9) |
Jul
(22) |
Aug
(11) |
Sep
(5) |
Oct
|
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(29) |
Mar
(85) |
Apr
(45) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
(30) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(55) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2005 |
Jan
|
Feb
(10) |
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(6) |
Mar
(12) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2010 |
Jan
|
Feb
(15) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <os...@us...> - 2004-01-12 18:42:39
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11804/src
Modified Files:
control.c settings.c strpcre.c
Log Message:
Fixed SIGWINCH handling.
Now parse -t option.
First attempt to actual cutting (not working, yet).
Index: control.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/control.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** control.c 12 Jan 2004 11:17:55 -0000 1.17
--- control.c 12 Jan 2004 18:42:36 -0000 1.18
***************
*** 84,88 ****
#ifdef RESIZE
case SIGWINCH: /* Window resize */
! printf("aaa\n");
win_width=get_term_width();
break;
--- 84,88 ----
#ifdef RESIZE
case SIGWINCH: /* Window resize */
! loop=1;
win_width=get_term_width();
break;
Index: settings.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** settings.c 12 Jan 2004 12:46:22 -0000 1.24
--- settings.c 12 Jan 2004 18:42:36 -0000 1.25
***************
*** 147,151 ****
#endif
memset(&lw_conf,0,sizeof(lw_conf));
! while((c=getopt_long(argc,argv,"vC:f:i:co:Osh",opt,&idx))!=EOF) {
switch(c) {
case 'C':
--- 147,151 ----
#endif
memset(&lw_conf,0,sizeof(lw_conf));
! while((c=getopt_long(argc,argv,"vC:f:i:co:Osht",opt,&idx))!=EOF) {
switch(c) {
case 'C':
Index: strpcre.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/strpcre.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** strpcre.c 11 Jan 2004 21:23:48 -0000 1.18
--- strpcre.c 12 Jan 2004 18:42:36 -0000 1.19
***************
*** 163,168 ****
}
void showline(char *input) {
! int i,n,ignore;
const char **re_str;
char *match;
--- 163,181 ----
}
+ char* cut_line(char *output, char *input,int real_len)
+ {
+ int to_cut=real_len-win_width;
+ printf("%d - %d = %d\n",real_len,win_width,to_cut);
+ if (to_cut<1) {output=input; return output;}
+ strncpy(output,input,strlen(input));
+ output[strlen(input)-to_cut+1]=0;
+ while (to_cut) {
+ to_cut--;
+ }
+ return output;
+ }
+
void showline(char *input) {
! int i,n,ignore,hl_num;
const char **re_str;
char *match;
***************
*** 176,179 ****
--- 189,193 ----
hl_c=0;
ignore=0;
+ hl_num=0;
n=pcre_exec(parser.pre,parser.prh,input,strlen(input),0,0,
(int*)&re_matches,RE_NMATCHES);
***************
*** 206,209 ****
--- 220,224 ----
if(lw_actions[i].mesg_color) mesg_c=lw_actions[i].mesg_color;
if(lw_actions[i].highlight_color) {
+ hl_num++;
hl_c=lw_actions[i].highlight_color;
match=hl_str(&lw_actions[i],mesg_s);
***************
*** 220,225 ****
if(!ignore) {
char *cstr;
! cstr=(char*)malloc(strlen(date_s)+strlen(host_s)+
! strlen(serv_s)+strlen(mesg_s)+17);
sprintf(cstr,"^%02i%s^%02i%s^%02i%s^%02i%s^01\n",
DATE_COLOR,date_s,
--- 235,246 ----
if(!ignore) {
char *cstr;
! #ifdef RESIZE
! char *cutstr;
! #endif
! int len=strlen(date_s)+strlen(host_s)+strlen(serv_s)+strlen(mesg_s)+17;
! cstr=(char*)malloc(len);
! #ifdef RESIZE
! cutstr=(char*)malloc(len);
! #endif
sprintf(cstr,"^%02i%s^%02i%s^%02i%s^%02i%s^01\n",
DATE_COLOR,date_s,
***************
*** 227,231 ****
--- 248,258 ----
SERV_COLOR,serv_s,
MESG_COLOR,mesg_s);
+ #ifdef RESIZE
+ if (lw_conf.term_cut) cutstr=cut_line(cutstr,cstr,len-hl_num*6-5*3);
+ cprintf(cutstr);
+ free((void*)cutstr);
+ #else
cprintf(cstr);
+ #endif
free((void*)cstr);
}
|
|
From: <ar...@us...> - 2004-01-12 12:50:00
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv30543 Modified Files: ChangeLog Log Message: fixed SEGV when run with -O without -o Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ChangeLog 4 Jan 2004 02:08:16 -0000 1.20 --- ChangeLog 12 Jan 2004 12:49:53 -0000 1.21 *************** *** 2,5 **** --- 2,6 ---- at least on x86 - input_fifo is obsoleted now, use input_file instead + - fixed SEGV when run with -O and without -o 0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz) |
|
From: <ar...@us...> - 2004-01-12 12:46:25
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29734/src
Modified Files:
lwatch.c settings.c
Log Message:
Fix SEGV when -O without -o.
Index: lwatch.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/lwatch.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** lwatch.c 12 Jan 2004 11:17:55 -0000 1.22
--- lwatch.c 12 Jan 2004 12:46:22 -0000 1.23
***************
*** 42,45 ****
--- 42,46 ----
#include "config.h"
#include "control.h"
+ #include "defaults.h"
#include "settings.h"
#include "strpcre.h"
***************
*** 61,64 ****
--- 62,71 ----
parse_options(argc,argv);
parse_config();
+ /*** Tymczasowo ***/
+ if(!strlen(lw_conf.in_file))
+ strncpy(lw_conf.in_file,DEF_IN_FILE,MAXPATHLEN);
+ if(!strlen(lw_conf.out_file))
+ strncpy(lw_conf.out_file,DEF_OUT_FILE,MAXPATHLEN);
+ /******************/
set_handlers();
init_parser();
Index: settings.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** settings.c 12 Jan 2004 11:17:55 -0000 1.23
--- settings.c 12 Jan 2004 12:46:22 -0000 1.24
***************
*** 246,253 ****
--- 246,255 ----
#endif
fclose(yyin);
+ /* Tymczasowo przeniesione do lwatch.c *
if(!strlen(lw_conf.in_file))
strncpy(lw_conf.in_file,DEF_IN_FILE,MAXPATHLEN);
if(!strlen(lw_conf.out_file))
strncpy(lw_conf.out_file,DEF_OUT_FILE,MAXPATHLEN);
+ ***************************************/
#ifdef DEBUG
printf("date: %i, host: %i, serv: %i, mesg: %i\n",
|
|
From: <os...@us...> - 2004-01-12 11:17:58
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15165/src
Modified Files:
config.h.in control.c control.h lwatch.c settings.c
Log Message:
Changed way of obtaining terminal width.
Index: config.h.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/config.h.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** config.h.in 11 Jan 2004 21:23:48 -0000 1.15
--- config.h.in 12 Jan 2004 11:17:55 -0000 1.16
***************
*** 108,111 ****
--- 108,114 ----
#undef PACKAGE_VERSION
+ /* Define to 1 if you want to compile with resize support. */
+ #undef RESIZE
+
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
Index: control.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/control.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** control.c 11 Jan 2004 23:22:11 -0000 1.16
--- control.c 12 Jan 2004 11:17:55 -0000 1.17
***************
*** 41,55 ****
int loop;
! #ifdef CURSES
! #include <curses.h>
! #include <term.h>
! int win_width; /* Window width */
! int get_term_width() {
! int retval;
! initscr();
! retval=tgetnum("co");
! endwin();
#ifdef DEBUG
printf("Terminal width=%d\n",retval);
--- 41,55 ----
int loop;
! #ifdef RESIZE
! #include <sys/ioctl.h>
! #include <termios.h>
! unsigned short int win_width; /* Window width */
! unsigned short int get_term_width() {
! struct winsize wsz;
! unsigned short int retval;
! if (ioctl(fileno(stdout),TIOCGWINSZ,&wsz)) wsz.ws_col=80; /* Defaults to 80, if it's not a tty and other errors */
! retval=wsz.ws_col;
#ifdef DEBUG
printf("Terminal width=%d\n",retval);
***************
*** 82,86 ****
loop=0;
break;
! #ifdef CURSES
case SIGWINCH: /* Window resize */
printf("aaa\n");
--- 82,86 ----
loop=0;
break;
! #ifdef RESIZE
case SIGWINCH: /* Window resize */
printf("aaa\n");
***************
*** 103,107 ****
sig_check(signal(i,&signal_handle),"");
}
! #ifdef CURSES
sig_check(signal(SIGWINCH,&signal_handle),""); /* Window resize support */
#endif
--- 103,107 ----
sig_check(signal(i,&signal_handle),"");
}
! #ifdef RESIZE
sig_check(signal(SIGWINCH,&signal_handle),""); /* Window resize support */
#endif
Index: control.h
===================================================================
RCS file: /cvsroot/lwatch/files/src/control.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** control.h 11 Jan 2004 23:22:11 -0000 1.6
--- control.h 12 Jan 2004 11:17:55 -0000 1.7
***************
*** 46,50 ****
void show_poll_res(int res, struct pollfd *ufds, int n);
#endif
extern int loop;
! extern int win_width; /* Window width */
--- 46,53 ----
void show_poll_res(int res, struct pollfd *ufds, int n);
#endif
+ #ifdef RESIZE
+ unsigned short int get_term_width(void);
+ #endif
extern int loop;
! extern unsigned short int win_width; /* Window width */
Index: lwatch.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/lwatch.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** lwatch.c 11 Jan 2004 23:22:11 -0000 1.21
--- lwatch.c 12 Jan 2004 11:17:55 -0000 1.22
***************
*** 56,60 ****
checkeof=0;
! #ifdef CURSES
win_width=get_term_width();
#endif
--- 56,60 ----
checkeof=0;
! #ifdef RESIZE
win_width=get_term_width();
#endif
Index: settings.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** settings.c 11 Jan 2004 23:22:11 -0000 1.22
--- settings.c 12 Jan 2004 11:17:55 -0000 1.23
***************
*** 105,109 ****
"\tshows unparsed lines (like `last message repeated X times')",
" -O, --omit-rc",
! #ifdef CURSES
" -t, --term-cut",
"\tCut lines to terminal width",
--- 105,109 ----
"\tshows unparsed lines (like `last message repeated X times')",
" -O, --omit-rc",
! #ifdef RESIZE
" -t, --term-cut",
"\tCut lines to terminal width",
***************
*** 131,136 ****
{"show-unparsed",0,0,'s'},
{"omit-rc",0,0,'O'},
! #ifdef CURSES
! {"term-cut",0,0,'t'}¸
#endif
{"help",0,0,'h'},
--- 131,136 ----
{"show-unparsed",0,0,'s'},
{"omit-rc",0,0,'O'},
! #ifdef RESIZE
! {"term-cut",0,0,'t'},
#endif
{"help",0,0,'h'},
***************
*** 201,205 ****
#endif
break;
! #ifdef CURSES
case 't':
lw_conf.term_cut=1;
--- 201,205 ----
#endif
break;
! #ifdef RESIZE
case 't':
lw_conf.term_cut=1;
|
|
From: <os...@us...> - 2004-01-12 11:17:58
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv15165
Modified Files:
configure.ac
Log Message:
Changed way of obtaining terminal width.
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** configure.ac 11 Jan 2004 23:22:11 -0000 1.38
--- configure.ac 12 Jan 2004 11:17:55 -0000 1.39
***************
*** 36,39 ****
--- 36,42 ----
[Default input file])
+ AH_TEMPLATE([RESIZE],
+ [Define to 1 if you want to compile with resize support.])
+
AC_MSG_CHECKING(for platform dependent directories)
case $target in
***************
*** 127,138 ****
fi
! AC_MSG_CHECKING(for compile with curses)
! AC_ARG_ENABLE(curses,
! AC_HELP_STRING([--enable-curses],[Compile with curses]), ,
! [enable_curses="yes"])
! AC_MSG_RESULT($enable_curses)
! if test "$enable_curses" = "yes"; then
! AC_DEFINE(CURSES)
! LDFLAGS="${LDFLAGS} -lcurses"
fi
--- 130,141 ----
fi
! AC_MSG_CHECKING(for compile with terminal resizing support)
! AC_ARG_ENABLE(resize,
! AC_HELP_STRING([--enable-resize],[Compile with terminal resizing support]), ,
! [enable_resize="yes"])
! AC_MSG_RESULT($enable_resize)
! if test "$enable_resize" = "yes"; then
! AC_DEFINE(RESIZE)
! # LDFLAGS="${LDFLAGS} -lcurses"
fi
|
|
From: <os...@us...> - 2004-01-11 23:22:14
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1446/src
Modified Files:
control.c control.h lwatch.c settings.c settings.h
Log Message:
[Unusable changes]
Added --enable_curses configure option.
Added --term-cut lwatch option.
Added SIGWINCH handler.
...
And other preparations for closing "optionaly cut line in xterm" TODO.
Index: control.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/control.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** control.c 4 Apr 2003 21:06:29 -0000 1.15
--- control.c 11 Jan 2004 23:22:11 -0000 1.16
***************
*** 41,44 ****
--- 41,62 ----
int loop;
+ #ifdef CURSES
+ #include <curses.h>
+ #include <term.h>
+
+ int win_width; /* Window width */
+
+ int get_term_width() {
+ int retval;
+ initscr();
+ retval=tgetnum("co");
+ endwin();
+ #ifdef DEBUG
+ printf("Terminal width=%d\n",retval);
+ #endif
+ return retval;
+ }
+
+ #endif
void die(const char *s, ...) {
***************
*** 64,67 ****
--- 82,91 ----
loop=0;
break;
+ #ifdef CURSES
+ case SIGWINCH: /* Window resize */
+ printf("aaa\n");
+ win_width=get_term_width();
+ break;
+ #endif
}
#ifdef DEBUG
***************
*** 79,82 ****
--- 103,109 ----
sig_check(signal(i,&signal_handle),"");
}
+ #ifdef CURSES
+ sig_check(signal(SIGWINCH,&signal_handle),""); /* Window resize support */
+ #endif
}
Index: control.h
===================================================================
RCS file: /cvsroot/lwatch/files/src/control.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** control.h 29 Jun 2002 15:04:37 -0000 1.5
--- control.h 11 Jan 2004 23:22:11 -0000 1.6
***************
*** 48,49 ****
--- 48,50 ----
extern int loop;
+ extern int win_width; /* Window width */
Index: lwatch.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/lwatch.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** lwatch.c 4 Apr 2003 21:06:29 -0000 1.20
--- lwatch.c 11 Jan 2004 23:22:11 -0000 1.21
***************
*** 56,59 ****
--- 56,62 ----
checkeof=0;
+ #ifdef CURSES
+ win_width=get_term_width();
+ #endif
parse_options(argc,argv);
parse_config();
Index: settings.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** settings.c 10 Nov 2003 01:15:05 -0000 1.21
--- settings.c 11 Jan 2004 23:22:11 -0000 1.22
***************
*** 105,108 ****
--- 105,112 ----
"\tshows unparsed lines (like `last message repeated X times')",
" -O, --omit-rc",
+ #ifdef CURSES
+ " -t, --term-cut",
+ "\tCut lines to terminal width",
+ #endif
"\tdo not read values from config file",
" -h, --help",
***************
*** 127,130 ****
--- 131,137 ----
{"show-unparsed",0,0,'s'},
{"omit-rc",0,0,'O'},
+ #ifdef CURSES
+ {"term-cut",0,0,'t'}¸
+ #endif
{"help",0,0,'h'},
{0,0,0,0}
***************
*** 194,197 ****
--- 201,212 ----
#endif
break;
+ #ifdef CURSES
+ case 't':
+ lw_conf.term_cut=1;
+ #ifdef DEBUG
+ printf("Term-cut\n");
+ #endif
+ break;
+ #endif
case 'v':
show_licence();
Index: settings.h
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** settings.h 4 Apr 2003 15:11:43 -0000 1.9
--- settings.h 11 Jan 2004 23:22:11 -0000 1.10
***************
*** 40,43 ****
--- 40,44 ----
int create_fifo;
int show_unparsed;
+ int term_cut;
};
|
|
From: <os...@us...> - 2004-01-11 23:22:14
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv1446
Modified Files:
configure.ac
Log Message:
[Unusable changes]
Added --enable_curses configure option.
Added --term-cut lwatch option.
Added SIGWINCH handler.
...
And other preparations for closing "optionaly cut line in xterm" TODO.
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** configure.ac 11 Jan 2004 22:02:07 -0000 1.37
--- configure.ac 11 Jan 2004 23:22:11 -0000 1.38
***************
*** 127,130 ****
--- 127,140 ----
fi
+ AC_MSG_CHECKING(for compile with curses)
+ AC_ARG_ENABLE(curses,
+ AC_HELP_STRING([--enable-curses],[Compile with curses]), ,
+ [enable_curses="yes"])
+ AC_MSG_RESULT($enable_curses)
+ if test "$enable_curses" = "yes"; then
+ AC_DEFINE(CURSES)
+ LDFLAGS="${LDFLAGS} -lcurses"
+ fi
+
arc_sysconfdir=`eval echo $sysconfdir`
AC_DEFINE_UNQUOTED(SYSCONFDIR,"$arc_sysconfdir")
|
|
From: <ar...@us...> - 2004-01-11 22:11:30
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1:/tmp/cvs-serv19782/src Removed Files: Makefile.in Log Message: Autogenerated files removed from CVS and added to .cvsignore --- Makefile.in DELETED --- |
|
From: <ar...@us...> - 2004-01-11 22:11:29
|
Update of /cvsroot/lwatch/files/doc In directory sc8-pr-cvs1:/tmp/cvs-serv19782/doc Removed Files: Makefile.in Log Message: Autogenerated files removed from CVS and added to .cvsignore --- Makefile.in DELETED --- |
|
From: <ar...@us...> - 2004-01-11 22:11:27
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv19782 Added Files: .cvsignore Removed Files: Makefile.in configure Log Message: Autogenerated files removed from CVS and added to .cvsignore --- NEW FILE: .cvsignore --- configure Makefile.in --- Makefile.in DELETED --- --- configure DELETED --- |
|
From: <ar...@us...> - 2004-01-11 22:02:10
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv17533
Modified Files:
configure configure.ac
Log Message:
- -Wall should be after some initialization stuff
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** configure 11 Jan 2004 21:54:56 -0000 1.44
--- configure 11 Jan 2004 22:02:07 -0000 1.45
***************
*** 1805,1808 ****
--- 1805,1810 ----
+ CFLAGS="-Wall ${CFLAGS}"
+
#if test "$cache_file" = /dev/null; then
# cache_file="config.cache"
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** configure.ac 11 Jan 2004 21:50:16 -0000 1.36
--- configure.ac 11 Jan 2004 22:02:07 -0000 1.37
***************
*** 3,8 ****
# $Source$
- CFLAGS="-Wall ${CFLAGS}"
-
#Initializing
AC_PREREQ(2.57)
--- 3,6 ----
***************
*** 16,19 ****
--- 14,19 ----
AM_INIT_AUTOMAKE([dist-bzip2])
+
+ CFLAGS="-Wall ${CFLAGS}"
#if test "$cache_file" = /dev/null; then
|
|
From: <ar...@us...> - 2004-01-11 21:54:59
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv15833 Modified Files: configure Log Message: - default -Wall Index: configure =================================================================== RCS file: /cvsroot/lwatch/files/configure,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** configure 11 Jan 2004 21:50:16 -0000 1.43 --- configure 11 Jan 2004 21:54:56 -0000 1.44 *************** *** 1,4 **** #! /bin/sh ! # From configure.ac Revision: 1.35 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for lwatch 0.4. --- 1,4 ---- #! /bin/sh ! # From configure.ac Revision: 1.36 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for lwatch 0.4. |
|
From: <ar...@us...> - 2004-01-11 21:50:20
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv14938
Modified Files:
configure configure.ac
Log Message:
- default -Wall
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** configure 11 Jan 2004 21:23:48 -0000 1.42
--- configure 11 Jan 2004 21:50:16 -0000 1.43
***************
*** 1,4 ****
#! /bin/sh
! # From configure.ac Revision: 1.34 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for lwatch 0.4.
--- 1,4 ----
#! /bin/sh
! # From configure.ac Revision: 1.35 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for lwatch 0.4.
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** configure.ac 11 Jan 2004 21:23:48 -0000 1.35
--- configure.ac 11 Jan 2004 21:50:16 -0000 1.36
***************
*** 3,6 ****
--- 3,8 ----
# $Source$
+ CFLAGS="-Wall ${CFLAGS}"
+
#Initializing
AC_PREREQ(2.57)
|
|
From: <ar...@us...> - 2004-01-11 21:49:11
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1:/tmp/cvs-serv14370 Modified Files: yparse.l Log Message: - nounput Index: yparse.l =================================================================== RCS file: /cvsroot/lwatch/files/src/yparse.l,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** yparse.l 11 Jan 2004 21:23:48 -0000 1.21 --- yparse.l 11 Jan 2004 21:49:08 -0000 1.22 *************** *** 70,74 **** %} ! %option noyywrap M_KEYWORD input_fifo|input_file|output_file|create_fifo|show_unparsed --- 70,74 ---- %} ! %option noyywrap nounput M_KEYWORD input_fifo|input_file|output_file|create_fifo|show_unparsed |
|
From: <ar...@us...> - 2004-01-11 21:23:51
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8905/src
Modified Files:
config.h.in strpcre.c yparse.l
Log Message:
- AC_C_CONST turned again, let's include "config.h" as first
Index: config.h.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/config.h.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** config.h.in 3 Jan 2004 23:05:13 -0000 1.14
--- config.h.in 11 Jan 2004 21:23:48 -0000 1.15
***************
*** 1,213 ****
/* src/config.h.in. Generated from configure.ac by autoheader. */
! /*
! Define to 1 if you want to compile
! with debug support. */
#undef DEBUG
! /*
! Define to 1 if you don't have `vprintf'
! but do have `_doprnt.' */
#undef HAVE_DOPRNT
! /*
! Define to 1 if you have the <errno.h>
! header file. */
#undef HAVE_ERRNO_H
! /*
! Define to 1 if you have the <fcntl.h>
! header file. */
#undef HAVE_FCNTL_H
! /*
! Define to 1 if you have the <getopt.h>
! header file. */
#undef HAVE_GETOPT_H
! /*
! Define to 1 if you have the <inttypes.h>
! header file. */
#undef HAVE_INTTYPES_H
! /*
! Define to 1 if you have the `pcre'
! library (-lpcre). */
#undef HAVE_LIBPCRE
! /*
! Define to 1 if your system has a
! GNU libc compatible `malloc' function, and to 0 otherwise.
! */
#undef HAVE_MALLOC
! /*
! Define to 1 if you have the <memory.h>
! header file. */
#undef HAVE_MEMORY_H
! /*
! Define to 1 if you have the `memset'
! function. */
#undef HAVE_MEMSET
! /*
! Define to 1 if you have the <pcre.h>
! header file. */
#undef HAVE_PCRE_H
! /*
! Define to 1 if your system has a
! GNU libc compatible `realloc' function, and to 0 otherwise.
! */
#undef HAVE_REALLOC
! /*
! Define to 1 if you have the <signal.h>
! header file. */
#undef HAVE_SIGNAL_H
! /*
! Define to 1 if you have the <stdarg.h>
! header file. */
#undef HAVE_STDARG_H
! /*
! Define to 1 if you have the <stddef.h>
! header file. */
#undef HAVE_STDDEF_H
! /*
! Define to 1 if you have the <stdint.h>
! header file. */
#undef HAVE_STDINT_H
! /*
! Define to 1 if you have the <stdio.h>
! header file. */
#undef HAVE_STDIO_H
! /*
! Define to 1 if you have the <stdlib.h>
! header file. */
#undef HAVE_STDLIB_H
! /*
! Define to 1 if you have the `strcasecmp'
! function. */
#undef HAVE_STRCASECMP
! /*
! Define to 1 if you have the `strchr'
! function. */
#undef HAVE_STRCHR
! /*
! Define to 1 if you have the <strings.h>
! header file. */
#undef HAVE_STRINGS_H
! /*
! Define to 1 if you have the <string.h>
! header file. */
#undef HAVE_STRING_H
! /*
! Define to 1 if you have the <sys/param.h>
! header file. */
#undef HAVE_SYS_PARAM_H
! /*
! Define to 1 if you have the <sys/poll.h>
! header file. */
#undef HAVE_SYS_POLL_H
! /*
! Define to 1 if you have the <sys/stat.h>
! header file. */
#undef HAVE_SYS_STAT_H
! /*
! Define to 1 if you have the <sys/types.h>
! header file. */
#undef HAVE_SYS_TYPES_H
! /*
! Define to 1 if you have the <unistd.h>
! header file. */
#undef HAVE_UNISTD_H
! /*
! Define to 1 if you have the `vprintf'
! function. */
#undef HAVE_VPRINTF
! /*
! Default input file */
#undef INPUTFILE
! /*
! Name of package */
#undef PACKAGE
! /*
! Define to the address where bug reports for
! this package should be sent. */
#undef PACKAGE_BUGREPORT
! /*
! Define to the full name of this package.
! */
#undef PACKAGE_NAME
! /*
! Define to the full name and version of
! this package. */
#undef PACKAGE_STRING
! /*
! Define to the one symbol short name of
! this package. */
#undef PACKAGE_TARNAME
! /*
! Define to the version of this package. */
#undef PACKAGE_VERSION
! /*
! Define as the return type of signal handlers
! (`int' or `void'). */
#undef RETSIGTYPE
! /*
! Define to 1 if you have the ANSI
! C header files. */
#undef STDC_HEADERS
! /*
! Directory where configuration file is placed */
#undef SYSCONFDIR
! /*
! Version number of package */
#undef VERSION
! /*
! Define to 1 if `lex' declares `yytext' as
! a `char *' by default, not a `char[]'. */
#undef YYTEXT_POINTER
! /*
! Define to empty if `const' does not conform
! to ANSI C. */
#undef const
! /*
! Define to rpl_malloc if the replacement function should
! be used. */
#undef malloc
! /*
! Define to rpl_realloc if the replacement function should
! be used. */
#undef realloc
--- 1,133 ----
/* src/config.h.in. Generated from configure.ac by autoheader. */
! /* Define to 1 if you want to compile with debug support. */
#undef DEBUG
! /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
! /* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
! /* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
! /* Define to 1 if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H
! /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
! /* Define to 1 if you have the `pcre' library (-lpcre). */
#undef HAVE_LIBPCRE
! /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
! to 0 otherwise. */
#undef HAVE_MALLOC
! /* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
! /* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
! /* Define to 1 if you have the <pcre.h> header file. */
#undef HAVE_PCRE_H
! /* Define to 1 if your system has a GNU libc compatible `realloc' function,
! and to 0 otherwise. */
#undef HAVE_REALLOC
! /* Define to 1 if you have the <signal.h> header file. */
#undef HAVE_SIGNAL_H
! /* Define to 1 if you have the <stdarg.h> header file. */
#undef HAVE_STDARG_H
! /* Define to 1 if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
! /* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
! /* Define to 1 if you have the <stdio.h> header file. */
#undef HAVE_STDIO_H
! /* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
! /* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
! /* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
! /* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
! /* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
! /* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
! /* Define to 1 if you have the <sys/poll.h> header file. */
#undef HAVE_SYS_POLL_H
! /* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
! /* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
! /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
! /* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
! /* Default input file */
#undef INPUTFILE
! /* Name of package */
#undef PACKAGE
! /* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
! /* Define to the full name of this package. */
#undef PACKAGE_NAME
! /* Define to the full name and version of this package. */
#undef PACKAGE_STRING
! /* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
! /* Define to the version of this package. */
#undef PACKAGE_VERSION
! /* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
! /* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
! /* Directory where configuration file is placed */
#undef SYSCONFDIR
! /* Version number of package */
#undef VERSION
! /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
! `char[]'. */
#undef YYTEXT_POINTER
! /* Define to empty if `const' does not conform to ANSI C. */
#undef const
! /* Define to rpl_malloc if the replacement function should be used. */
#undef malloc
! /* Define to rpl_realloc if the replacement function should be used. */
#undef realloc
Index: strpcre.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/strpcre.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** strpcre.c 10 Nov 2003 01:15:05 -0000 1.17
--- strpcre.c 11 Jan 2004 21:23:48 -0000 1.18
***************
*** 30,33 ****
--- 30,35 ----
*/
+ #include "config.h"
+
#include <pcre.h>
#include <stdio.h>
***************
*** 35,39 ****
#include <string.h>
- #include "config.h"
#include "control.h"
#include "acolors.h"
--- 37,40 ----
Index: yparse.l
===================================================================
RCS file: /cvsroot/lwatch/files/src/yparse.l,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** yparse.l 3 Jan 2004 23:05:13 -0000 1.20
--- yparse.l 11 Jan 2004 21:23:48 -0000 1.21
***************
*** 1,2 ****
--- 1,5 ----
+ %top{
+ #include "config.h"
+ }
%{
/* yparse.l -- LogWatcher
***************
*** 34,38 ****
#include <string.h>
- #include "config.h"
#include "control.h"
#include "acolors.h"
--- 37,40 ----
|
|
From: <ar...@us...> - 2004-01-11 21:23:51
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv8905
Modified Files:
configure configure.ac
Log Message:
- AC_C_CONST turned again, let's include "config.h" as first
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** configure 4 Jan 2004 01:59:01 -0000 1.41
--- configure 11 Jan 2004 21:23:48 -0000 1.42
***************
*** 1,6 ****
#! /bin/sh
! # From configure.ac Revision: 1.33 .
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.58 for lwatch 0.4.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
--- 1,6 ----
#! /bin/sh
! # From configure.ac Revision: 1.34 .
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59 for lwatch 0.4.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
***************
*** 857,878 ****
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
! --enable-debug
! Compile with diagnostic messages
! --enable-input=file
! Specify default input file other than /dev/lwatch
Some influential environment variables:
! CC
! C compiler command
! CFLAGS
! C compiler flags
! LDFLAGS
! linker flags, e.g. -L<lib dir> if you have
! libraries in a nonstandard directory <lib dir>
! CPPFLAGS
! C/C++ preprocessor flags, e.g. -I<include dir> if you
! have headers in a nonstandard directory <include dir>
! CPP
! C preprocessor
Use these variables to override the choices made by `configure' or to help
--- 857,871 ----
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
! --enable-debug Compile with diagnostic messages
! --enable-input=file Specify default input file other than /dev/lwatch
Some influential environment variables:
! CC C compiler command
! CFLAGS C compiler flags
! LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
! nonstandard directory <lib dir>
! CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
! headers in a nonstandard directory <include dir>
! CPP C preprocessor
Use these variables to override the choices made by `configure' or to help
***************
*** 975,979 ****
cat <<\_ACEOF
lwatch configure 0.4
! generated by GNU Autoconf 2.58
Copyright (C) 2003 Free Software Foundation, Inc.
--- 968,972 ----
cat <<\_ACEOF
lwatch configure 0.4
! generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
***************
*** 989,993 ****
It was created by lwatch $as_me 0.4, which was
! generated by GNU Autoconf 2.58. Invocation command line was
$ $0 $@
--- 982,986 ----
It was created by lwatch $as_me 0.4, which was
! generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
***************
*** 4157,4160 ****
--- 4150,4259 ----
# Checks for typedefs, structures, and compiler characteristics.
+ echo "$as_me:$LINENO: 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
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ int
+ main ()
+ {
+ /* FIXME: Include the comments suggested by Paul. */
+ #ifndef __cplusplus
+ /* Ultrix mips cc rejects this. */
+ typedef int charset[2];
+ const charset x;
+ /* SunOS 4.1.1 cc rejects this. */
+ char const *const *ccp;
+ char **p;
+ /* NEC SVR4.0.2 mips cc rejects this. */
+ struct point {int x, y;};
+ static struct point const zero = {0,0};
+ /* AIX XL C 1.02.0.0 rejects this.
+ It does not let you subtract one const X* pointer from another in
+ an arm of an if-expression whose if-part is not a constant
+ expression */
+ const char *g = "string";
+ ccp = &g + (g ? g-g : 0);
+ /* HPUX 7.0 cc rejects these. */
+ ++ccp;
+ p = (char**) ccp;
+ ccp = (char const *const *) p;
+ { /* SCO 3.2v4 cc rejects this. */
+ char *t;
+ char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+ *t++ = 0;
+ }
+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
+ int x[] = {25, 17};
+ const int *foo = &x[0];
+ ++foo;
+ }
+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+ typedef const int *iptr;
+ iptr p = 0;
+ ++p;
+ }
+ { /* AIX XL C 1.02.0.0 rejects this saying
+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+ struct s { int j; const int *ap[3]; };
+ struct s *b; b->j = 5;
+ }
+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+ const int foo = 10;
+ }
+ #endif
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_c_const=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_c_const=no
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define const
+ _ACEOF
+
+ fi
+
# Checks for library functions.
***************
*** 5603,5607 ****
This file was extended by lwatch $as_me 0.4, which was
! generated by GNU Autoconf 2.58. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
--- 5702,5706 ----
This file was extended by lwatch $as_me 0.4, which was
! generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
***************
*** 5666,5670 ****
ac_cs_version="\\
lwatch config.status 0.4
! configured by $0, generated by GNU Autoconf 2.58,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- 5765,5769 ----
ac_cs_version="\\
lwatch config.status 0.4
! configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** configure.ac 4 Jan 2004 01:59:01 -0000 1.34
--- configure.ac 11 Jan 2004 21:23:48 -0000 1.35
***************
*** 99,103 ****
# Checks for typedefs, structures, and compiler characteristics.
! dnl AC_C_CONST
# Checks for library functions.
--- 99,103 ----
# Checks for typedefs, structures, and compiler characteristics.
! AC_C_CONST
# Checks for library functions.
|
|
From: <ar...@us...> - 2004-01-04 02:08:26
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv1306 Modified Files: ChangeLog Log Message: cosmetic change Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ChangeLog 3 Jan 2004 23:05:12 -0000 1.19 --- ChangeLog 4 Jan 2004 02:08:16 -0000 1.20 *************** *** 1,3 **** ! 0.4: - input_fifo is obsoleted now, use input_file instead 0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz) --- 1,5 ---- ! 0.4: - cleaned code to compile without warnings when -Wall is used, ! at least on x86 ! - input_fifo is obsoleted now, use input_file instead 0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz) |
|
From: <ar...@us...> - 2004-01-04 01:59:08
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv32243
Modified Files:
configure.ac configure
Log Message:
Do not check for const conformity.
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** configure.ac 27 Aug 2003 23:43:57 -0000 1.33
--- configure.ac 4 Jan 2004 01:59:01 -0000 1.34
***************
*** 99,103 ****
# Checks for typedefs, structures, and compiler characteristics.
! AC_C_CONST
# Checks for library functions.
--- 99,103 ----
# Checks for typedefs, structures, and compiler characteristics.
! dnl AC_C_CONST
# Checks for library functions.
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** configure 3 Jan 2004 23:05:12 -0000 1.40
--- configure 4 Jan 2004 01:59:01 -0000 1.41
***************
*** 4157,4266 ****
# Checks for typedefs, structures, and compiler characteristics.
- echo "$as_me:$LINENO: 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
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- int
- main ()
- {
- /* FIXME: Include the comments suggested by Paul. */
- #ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
- const charset x;
- /* SunOS 4.1.1 cc rejects this. */
- char const *const *ccp;
- char **p;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
- ccp = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++ccp;
- p = (char**) ccp;
- ccp = (char const *const *) p;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
- }
- #endif
-
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_c_const=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_c_const=no
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
-
- cat >>confdefs.h <<\_ACEOF
- #define const
- _ACEOF
-
- fi
-
# Checks for library functions.
--- 4157,4160 ----
|
|
From: <ar...@us...> - 2004-01-03 23:17:33
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv6109 Modified Files: README Log Message: cosmetic correct Index: README =================================================================== RCS file: /cvsroot/lwatch/files/README,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** README 27 Aug 2003 23:43:57 -0000 1.21 --- README 3 Jan 2004 23:17:29 -0000 1.22 *************** *** 16,20 **** ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ - This package uses autotools. You can change all paths and directories running configure with proper options. --- 16,19 ---- *************** *** 32,36 **** http://www.oasis-open.org/docbook/tools/dtm/docbook-to-man.tar.gz ! docbook2man from docbook-utils are not supported and I am not sure if I will. --- 31,35 ---- http://www.oasis-open.org/docbook/tools/dtm/docbook-to-man.tar.gz ! docbook2man from docbook-utils is not supported and I am not sure if I will. *************** *** 75,80 **** * Cygwin ! Bartek Tomicki (xinu, sorry for mistake) told me that lwatch compiles and runs ! on cygwin without any problemes. You can contact him at xi...@bl... * FreeBSD --- 74,79 ---- * Cygwin ! Bartek Tomicki told me that lwatch compiles and runs on cygwin without any ! problemes. You can contact him at xi...@bl... * FreeBSD |
|
From: <ar...@us...> - 2004-01-03 23:05:21
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4155/src
Modified Files:
Makefile.in config.h.in yparse.l
Log Message:
input_fifo is obsoleted
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.in 4 Apr 2003 22:16:36 -0000 1.15
--- Makefile.in 3 Jan 2004 23:05:13 -0000 1.16
***************
*** 1,6 ****
! # Makefile.in generated by automake 1.7.2 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
***************
*** 92,95 ****
--- 92,96 ----
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
***************
*** 133,136 ****
--- 134,138 ----
CLEANFILES = yparse.c stamp-h.in *~
subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
***************
*** 162,167 ****
DATA = $(dist_sysconf_DATA)
! DIST_COMMON = $(dist_sysconf_DATA) Makefile.am Makefile.in config.h.in \
! yparse.c
SOURCES = $(lwatch_SOURCES)
--- 164,169 ----
DATA = $(dist_sysconf_DATA)
! DIST_COMMON = $(dist_sysconf_DATA) $(srcdir)/Makefile.in Makefile.am \
! config.h.in yparse.c
SOURCES = $(lwatch_SOURCES)
***************
*** 234,244 ****
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yparse.Po@am__quote@
- distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
--- 236,243 ----
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yparse.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
***************
*** 251,255 ****
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
--- 250,254 ----
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
! @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
***************
*** 374,378 ****
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
-
install: install-am
install-exec: install-exec-am
--- 373,376 ----
***************
*** 386,390 ****
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
--- 384,388 ----
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
***************
*** 395,399 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
--- 393,397 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
***************
*** 406,412 ****
distclean: distclean-am
!
! distclean-am: clean-am distclean-compile distclean-depend \
! distclean-generic distclean-hdr distclean-tags
dvi: dvi-am
--- 404,411 ----
distclean: distclean-am
! -rm -rf ./$(DEPDIR)
! -rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
! distclean-tags
dvi: dvi-am
***************
*** 429,433 ****
maintainer-clean: maintainer-clean-am
!
maintainer-clean-am: distclean-am maintainer-clean-generic
--- 428,433 ----
maintainer-clean: maintainer-clean-am
! -rm -rf ./$(DEPDIR)
! -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
***************
*** 449,462 ****
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
! distclean-depend distclean-generic distclean-hdr distclean-tags \
! distdir dvi dvi-am info info-am install install-am \
! install-binPROGRAMS install-data install-data-am \
! install-dist_sysconfDATA install-exec install-exec-am \
! install-info install-info-am install-man install-strip \
! installcheck installcheck-am installdirs maintainer-clean \
! maintainer-clean-generic mostlyclean mostlyclean-compile \
! mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
! uninstall-am uninstall-binPROGRAMS uninstall-dist_sysconfDATA \
! uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 449,461 ----
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
! distclean-generic distclean-hdr distclean-tags distdir dvi \
! dvi-am info info-am install install-am install-binPROGRAMS \
! install-data install-data-am install-dist_sysconfDATA \
! install-exec install-exec-am install-info install-info-am \
! install-man install-strip installcheck installcheck-am \
! installdirs maintainer-clean maintainer-clean-generic \
! mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
! ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
! uninstall-dist_sysconfDATA uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: config.h.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/config.h.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** config.h.in 25 Mar 2003 13:15:48 -0000 1.13
--- config.h.in 3 Jan 2004 23:05:13 -0000 1.14
***************
*** 1,133 ****
/* src/config.h.in. Generated from configure.ac by autoheader. */
! /* Define to 1 if you want to compile with debug support. */
#undef DEBUG
! /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
! /* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
! /* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
! /* Define to 1 if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H
! /* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
! /* Define to 1 if you have the `pcre' library (-lpcre). */
#undef HAVE_LIBPCRE
! /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
! to 0 otherwise. */
#undef HAVE_MALLOC
! /* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
! /* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
! /* Define to 1 if you have the <pcre.h> header file. */
#undef HAVE_PCRE_H
! /* Define to 1 if your system has a GNU libc compatible `realloc' function,
! and to 0 otherwise. */
#undef HAVE_REALLOC
! /* Define to 1 if you have the <signal.h> header file. */
#undef HAVE_SIGNAL_H
! /* Define to 1 if you have the <stdarg.h> header file. */
#undef HAVE_STDARG_H
! /* Define to 1 if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
! /* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
! /* Define to 1 if you have the <stdio.h> header file. */
#undef HAVE_STDIO_H
! /* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
! /* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
! /* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
! /* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
! /* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
! /* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
! /* Define to 1 if you have the <sys/poll.h> header file. */
#undef HAVE_SYS_POLL_H
! /* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
! /* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
! /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
! /* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
! /* Default input file */
#undef INPUTFILE
! /* Name of package */
#undef PACKAGE
! /* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
! /* Define to the full name of this package. */
#undef PACKAGE_NAME
! /* Define to the full name and version of this package. */
#undef PACKAGE_STRING
! /* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
! /* Define to the version of this package. */
#undef PACKAGE_VERSION
! /* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
! /* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
! /* Directory where configuration file is placed */
#undef SYSCONFDIR
! /* Version number of package */
#undef VERSION
! /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
! `char[]'. */
#undef YYTEXT_POINTER
! /* Define to empty if `const' does not conform to ANSI C. */
#undef const
! /* Define to rpl_malloc if the replacement function should be used. */
#undef malloc
! /* Define to rpl_realloc if the replacement function should be used. */
#undef realloc
--- 1,213 ----
/* src/config.h.in. Generated from configure.ac by autoheader. */
! /*
! Define to 1 if you want to compile
! with debug support. */
#undef DEBUG
! /*
! Define to 1 if you don't have `vprintf'
! but do have `_doprnt.' */
#undef HAVE_DOPRNT
! /*
! Define to 1 if you have the <errno.h>
! header file. */
#undef HAVE_ERRNO_H
! /*
! Define to 1 if you have the <fcntl.h>
! header file. */
#undef HAVE_FCNTL_H
! /*
! Define to 1 if you have the <getopt.h>
! header file. */
#undef HAVE_GETOPT_H
! /*
! Define to 1 if you have the <inttypes.h>
! header file. */
#undef HAVE_INTTYPES_H
! /*
! Define to 1 if you have the `pcre'
! library (-lpcre). */
#undef HAVE_LIBPCRE
! /*
! Define to 1 if your system has a
! GNU libc compatible `malloc' function, and to 0 otherwise.
! */
#undef HAVE_MALLOC
! /*
! Define to 1 if you have the <memory.h>
! header file. */
#undef HAVE_MEMORY_H
! /*
! Define to 1 if you have the `memset'
! function. */
#undef HAVE_MEMSET
! /*
! Define to 1 if you have the <pcre.h>
! header file. */
#undef HAVE_PCRE_H
! /*
! Define to 1 if your system has a
! GNU libc compatible `realloc' function, and to 0 otherwise.
! */
#undef HAVE_REALLOC
! /*
! Define to 1 if you have the <signal.h>
! header file. */
#undef HAVE_SIGNAL_H
! /*
! Define to 1 if you have the <stdarg.h>
! header file. */
#undef HAVE_STDARG_H
! /*
! Define to 1 if you have the <stddef.h>
! header file. */
#undef HAVE_STDDEF_H
! /*
! Define to 1 if you have the <stdint.h>
! header file. */
#undef HAVE_STDINT_H
! /*
! Define to 1 if you have the <stdio.h>
! header file. */
#undef HAVE_STDIO_H
! /*
! Define to 1 if you have the <stdlib.h>
! header file. */
#undef HAVE_STDLIB_H
! /*
! Define to 1 if you have the `strcasecmp'
! function. */
#undef HAVE_STRCASECMP
! /*
! Define to 1 if you have the `strchr'
! function. */
#undef HAVE_STRCHR
! /*
! Define to 1 if you have the <strings.h>
! header file. */
#undef HAVE_STRINGS_H
! /*
! Define to 1 if you have the <string.h>
! header file. */
#undef HAVE_STRING_H
! /*
! Define to 1 if you have the <sys/param.h>
! header file. */
#undef HAVE_SYS_PARAM_H
! /*
! Define to 1 if you have the <sys/poll.h>
! header file. */
#undef HAVE_SYS_POLL_H
! /*
! Define to 1 if you have the <sys/stat.h>
! header file. */
#undef HAVE_SYS_STAT_H
! /*
! Define to 1 if you have the <sys/types.h>
! header file. */
#undef HAVE_SYS_TYPES_H
! /*
! Define to 1 if you have the <unistd.h>
! header file. */
#undef HAVE_UNISTD_H
! /*
! Define to 1 if you have the `vprintf'
! function. */
#undef HAVE_VPRINTF
! /*
! Default input file */
#undef INPUTFILE
! /*
! Name of package */
#undef PACKAGE
! /*
! Define to the address where bug reports for
! this package should be sent. */
#undef PACKAGE_BUGREPORT
! /*
! Define to the full name of this package.
! */
#undef PACKAGE_NAME
! /*
! Define to the full name and version of
! this package. */
#undef PACKAGE_STRING
! /*
! Define to the one symbol short name of
! this package. */
#undef PACKAGE_TARNAME
! /*
! Define to the version of this package. */
#undef PACKAGE_VERSION
! /*
! Define as the return type of signal handlers
! (`int' or `void'). */
#undef RETSIGTYPE
! /*
! Define to 1 if you have the ANSI
! C header files. */
#undef STDC_HEADERS
! /*
! Directory where configuration file is placed */
#undef SYSCONFDIR
! /*
! Version number of package */
#undef VERSION
! /*
! Define to 1 if `lex' declares `yytext' as
! a `char *' by default, not a `char[]'. */
#undef YYTEXT_POINTER
! /*
! Define to empty if `const' does not conform
! to ANSI C. */
#undef const
! /*
! Define to rpl_malloc if the replacement function should
! be used. */
#undef malloc
! /*
! Define to rpl_realloc if the replacement function should
! be used. */
#undef realloc
Index: yparse.l
===================================================================
RCS file: /cvsroot/lwatch/files/src/yparse.l,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** yparse.l 10 Nov 2003 01:15:05 -0000 1.19
--- yparse.l 3 Jan 2004 23:05:13 -0000 1.20
***************
*** 102,111 ****
<*>{COMMENT} ; /* Skip comments */
<INITIAL>input_fifo= {
! printf("lwatch.conf: OPTION input_fifo IN LINE %i IS DEPRECATED.\nUSE input_file INSTEAD IT.\n",lineno);
! yypch=lw_conf.in_file;
! #ifdef DEBUG
! strcpy(mymsg,"input_file");
! #endif
! PUSH(TEXT);
}
<INITIAL>input_file= {
--- 102,106 ----
<*>{COMMENT} ; /* Skip comments */
<INITIAL>input_fifo= {
! die("lwatch.conf: OPTION input_fifo IN LINE %i IS DEPRECATED.\nUSE input_file INSTEAD IT.\n",lineno);
}
<INITIAL>input_file= {
|
|
From: <ar...@us...> - 2004-01-03 23:05:20
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv4155
Modified Files:
ChangeLog Makefile.in TODO aclocal.m4 configure
Log Message:
input_fifo is obsoleted
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lwatch/files/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ChangeLog 27 Aug 2003 23:43:57 -0000 1.18
--- ChangeLog 3 Jan 2004 23:05:12 -0000 1.19
***************
*** 1,3 ****
! 0.4:
0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz)
--- 1,3 ----
! 0.4: - input_fifo is obsoleted now, use input_file instead
0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.in 4 Apr 2003 22:16:31 -0000 1.19
--- Makefile.in 3 Jan 2004 23:05:12 -0000 1.20
***************
*** 1,6 ****
! # Makefile.in generated by automake 1.7.2 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
***************
*** 92,95 ****
--- 92,96 ----
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
***************
*** 140,146 ****
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
! DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
! Makefile.in NEWS TODO aclocal.m4 config.guess config.sub \
! configure configure.ac depcomp install-sh missing mkinstalldirs
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
--- 141,148 ----
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
! DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
! COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
! config.guess config.sub configure configure.ac depcomp \
! install-sh missing mkinstalldirs
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
***************
*** 245,251 ****
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
--- 247,259 ----
tags=; \
here=`pwd`; \
+ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ else \
+ include_option=--include; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && \
! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
***************
*** 363,372 ****
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
--- 371,380 ----
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
! mkdir $(distdir)/_build
! mkdir $(distdir)/_inst
chmod a-w $(distdir)
! dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
! && cd $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
***************
*** 395,399 ****
sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
! cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
--- 403,407 ----
sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
! @cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
***************
*** 404,412 ****
exit 1; } >&2
distcleancheck: distclean
! if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
--- 412,420 ----
exit 1; } >&2
distcleancheck: distclean
! @if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
! @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
***************
*** 429,433 ****
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
--- 437,441 ----
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
***************
*** 437,441 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
--- 445,449 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
***************
*** 448,451 ****
--- 456,460 ----
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
***************
*** 470,474 ****
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf autom4te.cache
maintainer-clean-am: distclean-am maintainer-clean-generic
--- 479,484 ----
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
! -rm -rf $(top_srcdir)/autom4te.cache
! -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
Index: TODO
===================================================================
RCS file: /cvsroot/lwatch/files/TODO,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** TODO 19 Sep 2003 18:58:32 -0000 1.27
--- TODO 3 Jan 2004 23:05:12 -0000 1.28
***************
*** 3,9 ****
Now (for 0.4):
- - obsolete input_fifo
- versioning of configuration file
- - die() at input_fifo
- run as daemon
- configure: --with-pcre support
--- 3,7 ----
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/lwatch/files/aclocal.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aclocal.m4 2 Feb 2003 23:30:33 -0000 1.6
--- aclocal.m4 3 Jan 2004 23:05:12 -0000 1.7
***************
*** 1,3 ****
! # generated automatically by aclocal 1.7.2 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
--- 1,3 ----
! # generated automatically by aclocal 1.7.9 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
***************
*** 17,21 ****
# your package does certain things. But this isn't really a big deal.
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
--- 17,21 ----
# your package does certain things. But this isn't really a big deal.
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
***************
*** 35,46 ****
# 02111-1307, USA.
! # serial 8
!
! # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
! # written in clear, in which case automake, when reading aclocal.m4,
! # will think it sees a *use*, and therefore will trigger all it's
! # C support machinery. Also note that it means that autoscan, seeing
! # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
!
AC_PREREQ([2.54])
--- 35,39 ----
# 02111-1307, USA.
! # serial 10
AC_PREREQ([2.54])
***************
*** 87,92 ****
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
! AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
! AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
_AM_IF_OPTION([no-define],,
--- 80,85 ----
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
! AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
! AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
***************
*** 109,112 ****
--- 102,106 ----
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_SET_LEADING_DOT])dnl
_AM_IF_OPTION([no-dependencies],,
***************
*** 131,135 ****
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
! [_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
--- 125,138 ----
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
! [# Compute $1's index in $config_headers.
! _am_stamp_count=1
! for _am_header in $config_headers :; do
! case $_am_header in
! $1 | $1:* )
! break ;;
! * )
! _am_stamp_count=`expr $_am_stamp_count + 1` ;;
! esac
! done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
***************
*** 161,165 ****
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.7.2])])
# Helper functions for option handling. -*- Autoconf -*-
--- 164,168 ----
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.7.9])])
# Helper functions for option handling. -*- Autoconf -*-
***************
*** 447,453 ****
AC_SUBST([INSTALL_STRIP_PROGRAM])])
! # serial 4 -*- Autoconf -*-
! # Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
--- 450,489 ----
AC_SUBST([INSTALL_STRIP_PROGRAM])])
! # -*- Autoconf -*-
! # Copyright (C) 2003 Free Software Foundation, Inc.
! # 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., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! # serial 1
!
! # Check whether the underlying file-system supports filenames
! # with a leading dot. For instance MS-DOS doesn't.
! AC_DEFUN([AM_SET_LEADING_DOT],
! [rm -rf .tst 2>/dev/null
! mkdir .tst 2>/dev/null
! if test -d .tst; then
! am__leading_dot=.
! else
! am__leading_dot=_
! fi
! rmdir .tst 2>/dev/null
! AC_SUBST([am__leading_dot])])
!
! # serial 5 -*- Autoconf -*-
!
! # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
***************
*** 510,513 ****
--- 546,556 ----
cp "$am_depcomp" conftest.dir
cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
am_cv_$1_dependencies_compiler_type=none
***************
*** 516,525 ****
fi
for depmode in $am_compiler_list; do
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
! echo '#include "conftest.h"' > conftest.c
! echo 'int i;' > conftest.h
! echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
case $depmode in
--- 559,575 ----
fi
for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
! : > sub/conftest.c
! for i in 1 2 3 4 5 6; do
! echo '#include "conftst'$i'.h"' >> sub/conftest.c
! : > sub/conftst$i.h
! done
! echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
case $depmode in
***************
*** 539,549 ****
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
! source=conftest.c object=conftest.o \
! depfile=conftest.Po tmpdepfile=conftest.TPo \
! $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
! grep conftest.h conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
! am_cv_$1_dependencies_compiler_type=$depmode
! break
fi
done
--- 589,606 ----
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
! source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
! depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
! $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
! >/dev/null 2>conftest.err &&
! grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
! grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
! # icc doesn't choke on unknown options, it will just issue warnings
! # (even with -Werror). So we grep stderr for any message
! # that says an option was ignored.
! if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
! am_cv_$1_dependencies_compiler_type=$depmode
! break
! fi
fi
done
***************
*** 567,580 ****
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
! [rm -f .deps 2>/dev/null
! mkdir .deps 2>/dev/null
! if test -d .deps; then
! DEPDIR=.deps
! else
! # MS-DOS does not allow filenames that begin with a dot.
! DEPDIR=_deps
! fi
! rmdir .deps 2>/dev/null
! AC_SUBST([DEPDIR])
])
--- 624,629 ----
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
! [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
! AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
***************
*** 680,684 ****
# Check to see how 'make' treats includes. -*- Autoconf -*-
! # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
--- 729,733 ----
# Check to see how 'make' treats includes. -*- Autoconf -*-
! # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
***************
*** 705,710 ****
[am_make=${MAKE-make}
cat > confinc << 'END'
! doit:
@echo done
END
# If we don't find an include directive, just comment out the code.
--- 754,760 ----
[am_make=${MAKE-make}
cat > confinc << 'END'
! am__doit:
@echo done
+ .PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
***************
*** 734,740 ****
fi
fi
! AC_SUBST(am__include)
! AC_SUBST(am__quote)
! AC_MSG_RESULT($_am_result)
rm -f confinc confmf
])
--- 784,790 ----
fi
fi
! AC_SUBST([am__include])
! AC_SUBST([am__quote])
! AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** configure 7 Apr 2003 14:51:39 -0000 1.39
--- configure 3 Jan 2004 23:05:12 -0000 1.40
***************
*** 1,9 ****
#! /bin/sh
! # From configure.ac Revision: 1.32 .
# Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.57 for lwatch 0.3.
#
! # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
--- 1,8 ----
[...3383 lines suppressed...]
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
***************
*** 6299,6306 ****
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! X"$as_dir" : 'X\(//\)[^/]' \| \
! X"$as_dir" : 'X\(//\)$' \| \
! X"$as_dir" : 'X\(/\)' \| \
! . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--- 6701,6708 ----
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! X"$as_dir" : 'X\(//\)[^/]' \| \
! X"$as_dir" : 'X\(//\)$' \| \
! X"$as_dir" : 'X\(/\)' \| \
! . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
|
|
From: <ar...@us...> - 2004-01-03 23:05:19
|
Update of /cvsroot/lwatch/files/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv4155/doc
Modified Files:
Makefile.in lwatch.1.in
Log Message:
input_fifo is obsoleted
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile.in 4 Apr 2003 22:16:34 -0000 1.21
--- Makefile.in 3 Jan 2004 23:05:13 -0000 1.22
***************
*** 1,6 ****
! # Makefile.in generated by automake 1.7.2 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
--- 1,6 ----
! # Makefile.in generated by automake 1.7.9 from Makefile.am.
# @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
***************
*** 92,95 ****
--- 92,96 ----
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
***************
*** 133,136 ****
--- 134,138 ----
sed_prog = -e 's!@CONFDIR\@!$(sysconfdir)!g' -e 's!@BINDIR\@!$(bindir)!g' -e 's!@INPUTFILE\@!$(INPUTFILE)!g'
subdir = doc
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.h
***************
*** 140,144 ****
NROFF = nroff
MANS = $(man_MANS)
! DIST_COMMON = Makefile.am Makefile.in
all: all-am
--- 142,146 ----
NROFF = nroff
MANS = $(man_MANS)
! DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
all: all-am
***************
*** 241,245 ****
installdirs:
$(mkinstalldirs) $(DESTDIR)$(man1dir)
-
install: install-am
install-exec: install-exec-am
--- 243,246 ----
***************
*** 253,257 ****
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
--- 254,258 ----
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
***************
*** 262,266 ****
distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
--- 263,267 ----
distclean-generic:
! -rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
***************
*** 272,276 ****
distclean: distclean-am
!
distclean-am: clean-am distclean-generic
--- 273,277 ----
distclean: distclean-am
! -rm -f Makefile
distclean-am: clean-am distclean-generic
***************
*** 294,298 ****
maintainer-clean: maintainer-clean-am
!
maintainer-clean-am: distclean-am maintainer-clean-generic
--- 295,299 ----
maintainer-clean: maintainer-clean-am
! -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
Index: lwatch.1.in
===================================================================
RCS file: /cvsroot/lwatch/files/doc/lwatch.1.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** lwatch.1.in 8 Apr 2003 14:42:43 -0000 1.16
--- lwatch.1.in 3 Jan 2004 23:05:13 -0000 1.17
***************
*** 1,24 ****
! .\" This -*- nroff -*- file has been generated from
! .\" DocBook SGML with docbook-to-man on Debian GNU/Linux.
! ...\"
! ...\" transcript compatibility for postscript use.
! ...\"
! ...\" synopsis: .P! <file.ps>
! ...\"
.de P!
! \\&.
.fl \" force out current output buffer
! \\!%PB
! \\!/showpage{}def
! ...\" the following is from Ken Flowers -- it prevents dictionary overflows
! \\!/tempdict 200 dict def tempdict begin
.fl \" prolog
! .sy cat \\$1\" bring in postscript file
! ...\" the following line matches the tempdict above
! \\!end % tempdict %
! \\!PE
! \\!.
! .sp \\$2u \" move below the image
! ..
.de pF
.ie \\*(f1 .ds f1 \\n(.f
--- 1,22 ----
! .\" $Header$
! .\"
! .\" transcript compatibility for postscript use.
! .\"
! .\" synopsis: .P! <file.ps>
! .\"
.de P!
! .fl
! \!!1 setgray
! .fl
! \\&.\"
! .fl
! \!!0 setgray
.fl \" force out current output buffer
! \!!save /psv exch def currentpoint translate 0 0 moveto
! \!!/showpage{}def
.fl \" prolog
! .sy sed -e 's/^/!/' \\$1\" bring in postscript file
! \!!psv restore
! .
.de pF
.ie \\*(f1 .ds f1 \\n(.f
***************
*** 59,63 ****
.SH "SYNOPSIS"
.PP
! \fBlwatch\fP [-C \fIfilename\fP] [--config \fIfilename\fP] [-i \fIfilename\fP] [--input \fIfilename\fP] [-o \fIfilename\fP] [--output \fIfilename\fP] [-sOhv] [--show-unparsed] [--omit-rc] [--help]
.SH "Description"
.PP
--- 57,61 ----
.SH "SYNOPSIS"
.PP
! \fBlwatch\fR [-C \fIfilename\fR] [--config \fIfilename\fR] [-i \fIfilename\fR] [--input \fIfilename\fR] [-o \fIfilename\fR] [--output \fIfilename\fR] [-sOhv] [--show-unparsed] [--omit-rc] [--help]
.SH "Description"
.PP
***************
*** 89,100 ****
.PP
! .IP "\fB-C \fIfilename\fP\fP" 10
! .IP "\fB--config \fIfilename\fP\fP" 10
read config from filename instead of @CONFDIR@/lwatch.conf
! .IP "\fB-i \fIfilename\fP\fP" 10
! .IP "\fB--input \fIfilename\fP\fP" 10
read data from named fifo filename instead of @INPUTFILE@
! .IP "\fB-o \fIfilename\fP\fP" 10
! .IP "\fB--output \fIfilename\fP\fP" 10
write colored logs to filename instead of standard output
.IP "\fB-s\fP" 10
--- 87,98 ----
.PP
! .IP "\fB-C \fIfilename\fR\fP" 10
! .IP "\fB--config \fIfilename\fR\fP" 10
read config from filename instead of @CONFDIR@/lwatch.conf
! .IP "\fB-i \fIfilename\fR\fP" 10
! .IP "\fB--input \fIfilename\fR\fP" 10
read data from named fifo filename instead of @INPUTFILE@
! .IP "\fB-o \fIfilename\fR\fP" 10
! .IP "\fB--output \fIfilename\fR\fP" 10
write colored logs to filename instead of standard output
.IP "\fB-s\fP" 10
***************
*** 158,160 ****
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
! ...\" created by instant / docbook-to-man, Tue 08 Apr 2003, 16:34
--- 156,158 ----
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
! .\" created by instant / docbook-to-man, Sat 03 Jan 2004, 23:56
|
|
From: <ar...@us...> - 2003-09-19 20:22:33
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv18274 Modified Files: TODO Log Message: New feature Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** TODO 28 Aug 2003 19:36:07 -0000 1.26 --- TODO 19 Sep 2003 18:58:32 -0000 1.27 *************** *** 11,14 **** --- 11,15 ---- - debug/error messages should be printed to stderr/syslog - more documentation: complete lwatch(1), write lwatch.conf(5), edit INSTALL + - optionaly cut line to $COLUMNS to fit in xterm Later (for 0.5): |
|
From: <ar...@us...> - 2003-08-28 19:36:11
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv5296 Modified Files: TODO Log Message: - plans :) Index: TODO =================================================================== RCS file: /cvsroot/lwatch/files/TODO,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** TODO 8 Apr 2003 14:20:47 -0000 1.25 --- TODO 28 Aug 2003 19:36:07 -0000 1.26 *************** *** 3,7 **** --- 3,9 ---- Now (for 0.4): + - obsolete input_fifo - versioning of configuration file + - die() at input_fifo - run as daemon - configure: --with-pcre support *************** *** 11,14 **** --- 13,17 ---- Later (for 0.5): + - permanently remove input_fifo - support for growing regular files (like tail -f) - signal handling (reload configuration, reexec program) *************** *** 20,28 **** - running external program as action ! Later: - extended rules: conditions, nested rules - user defined input format - write documentation in info format - take color codes from termcap (slang? ncurses?) Won't do: --- 23,33 ---- - running external program as action ! Later (most probably after 1.0): - extended rules: conditions, nested rules - user defined input format - write documentation in info format - take color codes from termcap (slang? ncurses?) + - multiple sources + - multiple types of pattern Won't do: |
|
From: <ar...@us...> - 2003-08-27 23:44:11
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv4728/files Modified Files: AUTHORS ChangeLog README configure.ac Log Message: - get ready for 0.4 Index: AUTHORS =================================================================== RCS file: /cvsroot/lwatch/files/AUTHORS,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AUTHORS 25 Mar 2003 13:15:46 -0000 1.6 --- AUTHORS 27 Aug 2003 23:43:57 -0000 1.7 *************** *** 8,10 **** - Karolina Gajkowska <ka...@bl...> - Krzysztof "Borys" Kowalik <kko...@uc...> ! - Dawid "QNeX" Kuroczko --- 8,10 ---- - Karolina Gajkowska <ka...@bl...> - Krzysztof "Borys" Kowalik <kko...@uc...> ! - Dawid "QNeX" Kuroczko <qn...@kn...> Index: ChangeLog =================================================================== RCS file: /cvsroot/lwatch/files/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ChangeLog 7 Apr 2003 13:33:05 -0000 1.17 --- ChangeLog 27 Aug 2003 23:43:57 -0000 1.18 *************** *** 1,2 **** --- 1,4 ---- + 0.4: + 0.3: - --fifo and -f are deprecated, use --input and -i instead (arturcz) - new options for output file (-o and --output) (arturcz) Index: README =================================================================== RCS file: /cvsroot/lwatch/files/README,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** README 10 Apr 2003 21:52:46 -0000 1.20 --- README 27 Aug 2003 23:43:57 -0000 1.21 *************** *** 16,20 **** ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ - For me it works with libpcre 3.4. This package uses autotools. You can change all paths and directories --- 16,19 ---- Index: configure.ac =================================================================== RCS file: /cvsroot/lwatch/files/configure.ac,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** configure.ac 7 Apr 2003 14:33:56 -0000 1.32 --- configure.ac 27 Aug 2003 23:43:57 -0000 1.33 *************** *** 5,9 **** #Initializing AC_PREREQ(2.57) ! AC_INIT([lwatch], [0.3]) AC_REVISION($Revision$) AC_CONFIG_SRCDIR(src/lwatch.c) --- 5,9 ---- #Initializing AC_PREREQ(2.57) ! AC_INIT([lwatch], [0.4]) AC_REVISION($Revision$) AC_CONFIG_SRCDIR(src/lwatch.c) |
