lwatch-cvs Mailing List for Log Watcher (Page 12)
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: <ar...@us...> - 2003-03-15 18:44:39
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv9199
Modified Files:
configure.ac
Log Message:
- any sufficiently advanced technology is indistinguishable from magic;
a new manual rebuilding logic is really magic, for me too
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configure.ac 15 Mar 2003 14:47:27 -0000 1.11
--- configure.ac 15 Mar 2003 18:44:36 -0000 1.12
***************
*** 13,37 ****
# Checks for manual building
- AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
- AC_CHECK_FILE([${srcdir}/distributed-package],[ac_check_dist="yes"],[ac_check_dist="no"])
-
AC_MSG_CHECKING(for manual rebuild)
AC_ARG_ENABLE(manual,
AC_HELP_STRING(
[--enable-manual],
! [Building manual from sgml, require docbook-to-man]),
[],[enable_manual="yes"]
)
AC_MSG_RESULT($enable_manual)
if test "$enable_manual" = "yes"; then
! if test "$ac_check_dist" = "yes"; then
! if test "$dbook2man" = "no"; then
AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
! fi
! else
! if test "$dbook2man" = "no"; then
! AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual])
! fi
fi
fi
--- 13,48 ----
# Checks for manual building
AC_MSG_CHECKING(for manual rebuild)
AC_ARG_ENABLE(manual,
AC_HELP_STRING(
[--enable-manual],
! [Build manual]),
[],[enable_manual="yes"]
)
AC_MSG_RESULT($enable_manual)
+ AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
+ AC_CHECK_FILE([${srcdir}/distributed-package],[ac_check_dist="yes"],[ac_check_dist="no"])
+
+ # Sorry, this is only in polish
+ # Primo: enable/disable manual okre¶la, czy w ogóle chcê mieæ manual
+ # Mogê zrobiæ pakiet bez manuala, ale to za bardzo nie ma sensu
+ # Opcja liczy siê wtedy, kiedy instaluje siê program bezpo¶rednio z CVSu
+ # Przy robieniu tarballa zawsze trzeba w³±czyæ tam lwatch.1.in i w tym celu
+ # trzeba mieæ jaki¶ stuff do przerobienia sgml->man
+ # Alogorytm sprawdzania, co z manualem wygl±da nastêpuj±co:
+ # Sprawdzamy, czy w ogóle chcemy robiæ manual (--enable-manual - default)
+ # Je¿eli robimy manual, to sprawdzamy resztê - czy pakiet i czy jest soft
+ # Zg³aszaj±c odpowiednie b³êdy
+ # Je¿eli nie robimy manuala, to trzeba odpowiednio przygotowaæ target
+ # dla dist, coby wywala³o b³±d
+
if test "$enable_manual" = "yes"; then
! if test "$dbook2man" = "no"; then
! if test "$ac_check_dist" = "yes"; then
AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
! else
! AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual for tarball])
! fi
fi
fi
|
|
From: <ar...@us...> - 2003-03-15 14:47:30
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv14996 Modified Files: configure.ac Log Message: - next iteration of autotools configuration Index: configure.ac =================================================================== RCS file: /cvsroot/lwatch/files/configure.ac,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** configure.ac 13 Mar 2003 01:12:43 -0000 1.10 --- configure.ac 15 Mar 2003 14:47:27 -0000 1.11 *************** *** 25,39 **** AC_MSG_RESULT($enable_manual) ! #if test "$enable_manual" = "yes"; then ! # if test "$ac_check_dist" = "yes"; then ! # if test "$dbook2man" = "no"; then ! # AC_MSG_ERROR([docbook-to-man not found, cannot build manual]) ! # fi ! # else ! # if test "$dbook2man" = "no"; then ! # AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual]) ! # fi ! # fi ! #fi # Checks for programs. --- 25,39 ---- AC_MSG_RESULT($enable_manual) ! if test "$enable_manual" = "yes"; then ! if test "$ac_check_dist" = "yes"; then ! if test "$dbook2man" = "no"; then ! AC_MSG_ERROR([docbook-to-man not found, cannot build manual]) ! fi ! else ! if test "$dbook2man" = "no"; then ! AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual]) ! fi ! fi ! fi # Checks for programs. |
|
From: <ar...@us...> - 2003-03-15 14:47:30
|
Update of /cvsroot/lwatch/files/doc In directory sc8-pr-cvs1:/tmp/cvs-serv14996/doc Modified Files: Makefile.am Log Message: - next iteration of autotools configuration Index: Makefile.am =================================================================== RCS file: /cvsroot/lwatch/files/doc/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.am 7 Feb 2003 10:03:38 -0000 1.11 --- Makefile.am 15 Mar 2003 14:47:27 -0000 1.12 *************** *** 6,11 **** CLEANFILES = lwatch.1 conf.ent @DOCMAN@ @DISTMAN@ - if DISTRO if MAKE_MAN lwatch.1: lwatch.sgml conf.ent $(dbook2man) lwatch.sgml > lwatch.1 --- 6,11 ---- CLEANFILES = lwatch.1 conf.ent @DOCMAN@ @DISTMAN@ if MAKE_MAN + if DISTRO lwatch.1: lwatch.sgml conf.ent $(dbook2man) lwatch.sgml > lwatch.1 *************** *** 14,21 **** sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent else - lwatch.1: lwatch.1.in Makefile - sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1 - endif - else lwatch.1.in: lwatch.sgml conf.ent $(dbook2man) lwatch.sgml > lwatch.1.in --- 14,17 ---- *************** *** 24,25 **** --- 20,25 ---- cp conf.ent.in conf.ent endif + ##else + ##lwatch.1: lwatch.1.in Makefile + ## sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1 + ##endif |
|
From: <ar...@us...> - 2003-03-13 01:12:46
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv20047
Modified Files:
configure configure.ac
Log Message:
configure,ac: --disable-manual really works
other: automagically regenerated
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** configure 12 Mar 2003 22:23:45 -0000 1.14
--- configure 13 Mar 2003 01:12:43 -0000 1.15
***************
*** 1,4 ****
#! /bin/sh
! # From configure.ac Revision: 1.8 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
--- 1,4 ----
#! /bin/sh
! # From configure.ac Revision: 1.9 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
***************
*** 1739,1770 ****
fi
echo "$as_me:$LINENO: checking for manual rebuild" >&5
echo $ECHO_N "checking for manual rebuild... $ECHO_C" >&6
-
# Check whether --enable-manual or --disable-manual was given.
if test "${enable_manual+set}" = set; then
enableval="$enable_manual"
! enable_manual="yes"
else
! enable_manual="no"
fi;
echo "$as_me:$LINENO: result: $enable_manual" >&5
echo "${ECHO_T}$enable_manual" >&6
! if test "$enable_manual" = "yes"; then
! if test "$ac_check_dist" = "yes"; then
! if test "$dbook2man" = "no"; then
! { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot build manual" >&5
! echo "$as_me: error: docbook-to-man not found, cannot build manual" >&2;}
! { (exit 1); exit 1; }; }
! fi
! else
! if test "$dbook2man" = "no"; then
! { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot prepare manual" >&5
! echo "$as_me: error: docbook-to-man not found, cannot prepare manual" >&2;}
! { (exit 1); exit 1; }; }
! fi
! fi
! fi
# Checks for programs.
--- 1739,1767 ----
fi
+
echo "$as_me:$LINENO: checking for manual rebuild" >&5
echo $ECHO_N "checking for manual rebuild... $ECHO_C" >&6
# Check whether --enable-manual or --disable-manual was given.
if test "${enable_manual+set}" = set; then
enableval="$enable_manual"
!
else
! enable_manual="yes"
!
fi;
echo "$as_me:$LINENO: result: $enable_manual" >&5
echo "${ECHO_T}$enable_manual" >&6
! #if test "$enable_manual" = "yes"; then
! # if test "$ac_check_dist" = "yes"; then
! # if test "$dbook2man" = "no"; then
! # AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
! # fi
! # else
! # if test "$dbook2man" = "no"; then
! # AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual])
! # fi
! # fi
! #fi
# Checks for programs.
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configure.ac 12 Mar 2003 22:23:46 -0000 1.9
--- configure.ac 13 Mar 2003 01:12:43 -0000 1.10
***************
*** 15,38 ****
AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
AC_CHECK_FILE([${srcdir}/distributed-package],[ac_check_dist="yes"],[ac_check_dist="no"])
- AC_MSG_CHECKING(for manual rebuild)
AC_ARG_ENABLE(manual,
AC_HELP_STRING(
[--enable-manual],
[Building manual from sgml, require docbook-to-man]),
! [enable_manual="yes"],[enable_manual="no"])
AC_MSG_RESULT($enable_manual)
! if test "$enable_manual" = "yes"; then
! if test "$ac_check_dist" = "yes"; then
! if test "$dbook2man" = "no"; then
! AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
! fi
! else
! if test "$dbook2man" = "no"; then
! AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual])
! fi
! fi
! fi
# Checks for programs.
--- 15,39 ----
AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
AC_CHECK_FILE([${srcdir}/distributed-package],[ac_check_dist="yes"],[ac_check_dist="no"])
+ AC_MSG_CHECKING(for manual rebuild)
AC_ARG_ENABLE(manual,
AC_HELP_STRING(
[--enable-manual],
[Building manual from sgml, require docbook-to-man]),
! [],[enable_manual="yes"]
! )
AC_MSG_RESULT($enable_manual)
! #if test "$enable_manual" = "yes"; then
! # if test "$ac_check_dist" = "yes"; then
! # if test "$dbook2man" = "no"; then
! # AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
! # fi
! # else
! # if test "$dbook2man" = "no"; then
! # AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual])
! # fi
! # fi
! #fi
# Checks for programs.
|
|
From: <ar...@us...> - 2003-03-12 22:23:54
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv21680
Modified Files:
configure configure.ac
Log Message:
configure.ac: don't stop with error about lack docbook->man converter
if --disable-manual
other: automagically regenerated
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** configure 7 Feb 2003 10:09:32 -0000 1.13
--- configure 12 Mar 2003 22:23:45 -0000 1.14
***************
*** 1741,1744 ****
--- 1741,1745 ----
echo "$as_me:$LINENO: checking for manual rebuild" >&5
echo $ECHO_N "checking for manual rebuild... $ECHO_C" >&6
+
# Check whether --enable-manual or --disable-manual was given.
if test "${enable_manual+set}" = set; then
***************
*** 1751,1756 ****
echo "${ECHO_T}$enable_manual" >&6
! if test "$ac_check_dist" = "yes"; then
! if test "$enable_manual" = "yes"; then
if test "$dbook2man" = "no"; then
{ { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot build manual" >&5
--- 1752,1757 ----
echo "${ECHO_T}$enable_manual" >&6
! if test "$enable_manual" = "yes"; then
! if test "$ac_check_dist" = "yes"; then
if test "$dbook2man" = "no"; then
{ { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot build manual" >&5
***************
*** 1758,1767 ****
{ (exit 1); exit 1; }; }
fi
! fi
! else
! if test "$dbook2man" = "no"; then
! { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot prepare manual" >&5
echo "$as_me: error: docbook-to-man not found, cannot prepare manual" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
--- 1759,1768 ----
{ (exit 1); exit 1; }; }
fi
! else
! if test "$dbook2man" = "no"; then
! { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot prepare manual" >&5
echo "$as_me: error: docbook-to-man not found, cannot prepare manual" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
fi
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure.ac 7 Feb 2003 09:58:47 -0000 1.8
--- configure.ac 12 Mar 2003 22:23:46 -0000 1.9
***************
*** 16,19 ****
--- 16,20 ----
AC_CHECK_FILE([${srcdir}/distributed-package],[ac_check_dist="yes"],[ac_check_dist="no"])
AC_MSG_CHECKING(for manual rebuild)
+
AC_ARG_ENABLE(manual,
AC_HELP_STRING(
***************
*** 23,35 ****
AC_MSG_RESULT($enable_manual)
! if test "$ac_check_dist" = "yes"; then
! if test "$enable_manual" = "yes"; then
if test "$dbook2man" = "no"; then
AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
fi
! fi
! else
! if test "$dbook2man" = "no"; then
! AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual])
fi
fi
--- 24,36 ----
AC_MSG_RESULT($enable_manual)
! if test "$enable_manual" = "yes"; then
! if test "$ac_check_dist" = "yes"; then
if test "$dbook2man" = "no"; then
AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
fi
! else
! if test "$dbook2man" = "no"; then
! AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual])
! fi
fi
fi
|
|
From: <ar...@us...> - 2003-02-26 13:19:47
|
Update of /cvsroot/lwatch/files/src In directory sc8-pr-cvs1:/tmp/cvs-serv14355/src Modified Files: lwatch.conf Log Message: - language correct Index: lwatch.conf =================================================================== RCS file: /cvsroot/lwatch/files/src/lwatch.conf,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** lwatch.conf 25 Feb 2003 16:24:41 -0000 1.11 --- lwatch.conf 26 Feb 2003 13:19:43 -0000 1.12 *************** *** 33,37 **** # } # ! # Comments starts from # (hash) and FIXME trwaj± do end of line. # Below is configuration which works for me --- 33,37 ---- # } # ! # Comments start from # (hash) and end with end of line. # Below is configuration which works for me |
|
From: <ar...@us...> - 2003-02-25 16:30:09
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25000
Modified Files:
strpcre.c
Log Message:
- uuuuch, I've forgot about message
Index: strpcre.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/strpcre.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** strpcre.c 25 Feb 2003 16:24:44 -0000 1.14
--- strpcre.c 25 Feb 2003 16:30:00 -0000 1.15
***************
*** 189,193 ****
match=serv_s; /* match service */
} else if (lw_actions[i].match_host) {
! match=host_s; /* match message body */
}
n=pcre_exec(lw_actions[i].re,lw_actions[i].rh,
--- 189,195 ----
match=serv_s; /* match service */
} else if (lw_actions[i].match_host) {
! match=host_s; /* match hostname body */
! } else {
! match=mesg_s; /* match message body */
}
n=pcre_exec(lw_actions[i].re,lw_actions[i].rh,
|
|
From: <ar...@us...> - 2003-02-25 16:24:56
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21559/src
Modified Files:
lwatch.conf settings.c settings.h strpcre.c yparse.l
Log Message:
- directive match_host in config file added (requested by Przewdnik)
Index: lwatch.conf
===================================================================
RCS file: /cvsroot/lwatch/files/src/lwatch.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** lwatch.conf 23 Jul 2002 12:23:07 -0000 1.10
--- lwatch.conf 25 Feb 2003 16:24:41 -0000 1.11
***************
*** 46,49 ****
--- 46,54 ----
}
+ /border/ {
+ match_host # if message is originated by host border
+ host_color=red # show its name in red
+ }
+
/kernel/ { # if string kernel ...
match_service # appears in service ...
Index: settings.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** settings.c 8 Aug 2002 14:35:24 -0000 1.12
--- settings.c 25 Feb 2003 16:24:42 -0000 1.13
***************
*** 195,199 ****
paction->ignore?"yes":"no",
paction->exit?"yes":"no",
! paction->match_service?"yes":"no");
printf("^^^^^^^^^^^^^^^^\n");
#endif
--- 195,200 ----
paction->ignore?"yes":"no",
paction->exit?"yes":"no",
! paction->match_service?"yes":"no",
! paction->match_host?"yes":"no");
printf("^^^^^^^^^^^^^^^^\n");
#endif
Index: settings.h
===================================================================
RCS file: /cvsroot/lwatch/files/src/settings.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** settings.h 23 Jul 2002 11:41:04 -0000 1.6
--- settings.h 25 Feb 2003 16:24:43 -0000 1.7
***************
*** 53,56 ****
--- 53,57 ----
highlight_color; /* highlight color from re */
int match_service, /* match service instead message */
+ match_host, /* match hostname instead message */
ignore, /* ignore this line and do not display */
exit; /* dont process next options */
Index: strpcre.c
===================================================================
RCS file: /cvsroot/lwatch/files/src/strpcre.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** strpcre.c 8 Aug 2002 14:35:24 -0000 1.13
--- strpcre.c 25 Feb 2003 16:24:44 -0000 1.14
***************
*** 188,193 ****
if(lw_actions[i].match_service) {
match=serv_s; /* match service */
! } else {
! match=mesg_s; /* match message body */
}
n=pcre_exec(lw_actions[i].re,lw_actions[i].rh,
--- 188,193 ----
if(lw_actions[i].match_service) {
match=serv_s; /* match service */
! } else if (lw_actions[i].match_host) {
! match=host_s; /* match message body */
}
n=pcre_exec(lw_actions[i].re,lw_actions[i].rh,
Index: yparse.l
===================================================================
RCS file: /cvsroot/lwatch/files/src/yparse.l,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** yparse.l 8 Aug 2002 14:35:24 -0000 1.13
--- yparse.l 25 Feb 2003 16:24:45 -0000 1.14
***************
*** 71,75 ****
M_KEYWORD input_fifo|create_fifo
R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight
! R_KEYWORD match_service|ignore|exit
COLOR black|red|green|yellow|blue|magenta|cyan|white
STRING ".*"
--- 71,75 ----
M_KEYWORD input_fifo|create_fifo
R_KEYCOLOR date_color|host_color|serv_color|mesg_color|color|highlight
! R_KEYWORD match_service|match_host|ignore|exit
COLOR black|red|green|yellow|blue|magenta|cyan|white
STRING ".*"
***************
*** 209,215 ****
--- 209,227 ----
}
<MULTI,ACTION>match_service {
+ if(action.match_host) {
+ die("Error in line %i: only one of match_service and match_host can be set.\n",lineno);
+ }
action.match_service=1;
#ifdef DEBUG
printf("Match service instead message\n");
+ #endif
+ }
+ <MULTI,ACTION>match_host {
+ action.match_host=1;
+ if(action.match_service) {
+ die("Error in line %i: only one of match_service and match_host can be set.\n",lineno);
+ }
+ #ifdef DEBUG
+ printf("Match hostname instead message\n");
#endif
}
|
|
From: <ar...@us...> - 2003-02-07 10:09:37
|
Update of /cvsroot/lwatch/files In directory sc8-pr-cvs1:/tmp/cvs-serv11096 Modified Files: configure Log Message: - automagically regenerated Index: configure =================================================================== RCS file: /cvsroot/lwatch/files/configure,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** configure 7 Feb 2003 09:58:47 -0000 1.12 --- configure 7 Feb 2003 10:09:32 -0000 1.13 *************** *** 1,4 **** #! /bin/sh ! # From configure.ac Revision: 1.7 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for lwatch 0.1. --- 1,4 ---- #! /bin/sh ! # From configure.ac Revision: 1.8 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57 for lwatch 0.1. |
|
From: <ar...@us...> - 2003-02-07 10:09:37
|
Update of /cvsroot/lwatch/files/doc In directory sc8-pr-cvs1:/tmp/cvs-serv11096/doc Modified Files: Makefile.in Log Message: - automagically regenerated Index: Makefile.in =================================================================== RCS file: /cvsroot/lwatch/files/doc/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.in 7 Feb 2003 09:58:48 -0000 1.10 --- Makefile.in 7 Feb 2003 10:09:34 -0000 1.11 *************** *** 118,122 **** @DISTRO_TRUE@man_MANS = lwatch.1 dist_man_MANS = @DISTMAN@ ! EXTRA_DIST = lwatch.sgml CLEANFILES = lwatch.1 conf.ent @DOCMAN@ @DISTMAN@ subdir = doc --- 118,122 ---- @DISTRO_TRUE@man_MANS = lwatch.1 dist_man_MANS = @DISTMAN@ ! EXTRA_DIST = lwatch.sgml conf.ent.in CLEANFILES = lwatch.1 conf.ent @DOCMAN@ @DISTMAN@ subdir = doc |
|
From: <ar...@us...> - 2003-02-07 10:03:42
|
Update of /cvsroot/lwatch/files/doc In directory sc8-pr-cvs1:/tmp/cvs-serv8911 Modified Files: Makefile.am Log Message: - doc/Makefile.am: missing conf.ent.in from distribution Index: Makefile.am =================================================================== RCS file: /cvsroot/lwatch/files/doc/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.am 7 Feb 2003 09:58:47 -0000 1.10 --- Makefile.am 7 Feb 2003 10:03:38 -0000 1.11 *************** *** 3,7 **** endif dist_man_MANS = @DISTMAN@ ! EXTRA_DIST = lwatch.sgml CLEANFILES = lwatch.1 conf.ent @DOCMAN@ @DISTMAN@ --- 3,7 ---- endif dist_man_MANS = @DISTMAN@ ! EXTRA_DIST = lwatch.sgml conf.ent.in CLEANFILES = lwatch.1 conf.ent @DOCMAN@ @DISTMAN@ |
|
From: <ar...@us...> - 2003-02-07 09:58:52
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv5584
Modified Files:
Makefile.am Makefile.in configure configure.ac
Log Message:
- configure.ac: first check for components which are required for build,
next other tests
- doc/Makefile.am: proper conditional to make "make dist" and "make install"
works
- other: automagically regenerated
Index: Makefile.am
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am 3 Feb 2003 00:37:55 -0000 1.3
--- Makefile.am 7 Feb 2003 09:58:47 -0000 1.4
***************
*** 1 ****
--- 1,4 ----
SUBDIRS = src doc
+
+ dist-hook:
+ echo "Dont delete this file. It is required for proper building" > $(distdir)/distributed-package
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile.in 6 Feb 2003 23:34:05 -0000 1.12
--- Makefile.in 7 Feb 2003 09:58:47 -0000 1.13
***************
*** 327,330 ****
--- 327,333 ----
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
***************
*** 495,498 ****
--- 498,504 ----
uninstall-info-am uninstall-info-recursive uninstall-recursive
+
+ dist-hook:
+ echo "Dont delete this file. It is required for proper building" > $(distdir)/distributed-package
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** configure 6 Feb 2003 23:34:05 -0000 1.11
--- configure 7 Feb 2003 09:58:47 -0000 1.12
***************
*** 1,4 ****
#! /bin/sh
! # From configure.ac Revision: 1.6 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
--- 1,4 ----
#! /bin/sh
! # From configure.ac Revision: 1.7 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
***************
*** 310,314 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S LEX LEXLIB LEX_OUTPUT_ROOT dbook2man CPP EGREP LIBOBJS DISTRO_TRUE DISTRO_FALSE MAKE_MAN_TRUE MAKE_MAN_FALSE HAVE_D2M_TRUE HAVE_D2M_FALSE DOCMAN DISTMAN LTLIBOBJS'
ac_subst_files=''
--- 310,314 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE dbook2man CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S LEX LEXLIB LEX_OUTPUT_ROOT CPP EGREP LIBOBJS DISTRO_TRUE DISTRO_FALSE MAKE_MAN_TRUE MAKE_MAN_FALSE HAVE_D2M_TRUE HAVE_D2M_FALSE DOCMAN DISTMAN LTLIBOBJS'
ac_subst_files=''
***************
*** 848,855 ****
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
--enable-debug Compile with diagnostic messages
- --enable-manual Building manual from sgml, require docbook-to-man
Some influential environment variables:
--- 848,855 ----
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-manual Building manual from sgml, require docbook-to-man
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
--enable-debug Compile with diagnostic messages
Some influential environment variables:
***************
*** 1674,1677 ****
--- 1674,1770 ----
+ # Checks for manual building
+ # Extract the first word of "docbook-to-man", so it can be a program name with args.
+ set dummy docbook-to-man; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_dbook2man+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $dbook2man in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_dbook2man="$dbook2man" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_dbook2man="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
+ test -z "$ac_cv_path_dbook2man" && ac_cv_path_dbook2man="no"
+ ;;
+ esac
+ fi
+ dbook2man=$ac_cv_path_dbook2man
+
+ if test -n "$dbook2man"; then
+ echo "$as_me:$LINENO: result: $dbook2man" >&5
+ echo "${ECHO_T}$dbook2man" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ as_ac_File=`echo "ac_cv_file_${srcdir}/distributed-package" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for ${srcdir}/distributed-package" >&5
+ echo $ECHO_N "checking for ${srcdir}/distributed-package... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_File+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+ if test -r "${srcdir}/distributed-package"; then
+ eval "$as_ac_File=yes"
+ else
+ eval "$as_ac_File=no"
+ fi
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ if test `eval echo '${'$as_ac_File'}'` = yes; then
+ ac_check_dist="yes"
+ else
+ ac_check_dist="no"
+ fi
+
+ echo "$as_me:$LINENO: checking for manual rebuild" >&5
+ echo $ECHO_N "checking for manual rebuild... $ECHO_C" >&6
+ # Check whether --enable-manual or --disable-manual was given.
+ if test "${enable_manual+set}" = set; then
+ enableval="$enable_manual"
+ enable_manual="yes"
+ else
+ enable_manual="no"
+ fi;
+ echo "$as_me:$LINENO: result: $enable_manual" >&5
+ echo "${ECHO_T}$enable_manual" >&6
+
+ if test "$ac_check_dist" = "yes"; then
+ if test "$enable_manual" = "yes"; then
+ if test "$dbook2man" = "no"; then
+ { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot build manual" >&5
+ echo "$as_me: error: docbook-to-man not found, cannot build manual" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+ else
+ if test "$dbook2man" = "no"; then
+ { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot prepare manual" >&5
+ echo "$as_me: error: docbook-to-man not found, cannot prepare manual" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+
# Checks for programs.
ac_ext=c
***************
*** 3033,3077 ****
fi
- # Extract the first word of "docbook-to-man", so it can be a program name with args.
- set dummy docbook-to-man; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_dbook2man+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- case $dbook2man in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_dbook2man="$dbook2man" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_dbook2man="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-
- test -z "$ac_cv_path_dbook2man" && ac_cv_path_dbook2man="no"
- ;;
- esac
- fi
- dbook2man=$ac_cv_path_dbook2man
-
- if test -n "$dbook2man"; then
- echo "$as_me:$LINENO: result: $dbook2man" >&5
- echo "${ECHO_T}$dbook2man" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-
-
# Checks for header files.
ac_ext=c
--- 3126,3129 ----
***************
*** 4628,4657 ****
- # Checks for special file in distribution package
- as_ac_File=`echo "ac_cv_file_${srcdir}/distributed-package" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for ${srcdir}/distributed-package" >&5
- echo $ECHO_N "checking for ${srcdir}/distributed-package... $ECHO_C" >&6
- if eval "test \"\${$as_ac_File+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
- echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
- if test -r "${srcdir}/distributed-package"; then
- eval "$as_ac_File=yes"
- else
- eval "$as_ac_File=no"
- fi
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
- if test `eval echo '${'$as_ac_File'}'` = yes; then
- ac_check_dist="yes"
- else
- ac_check_dist="no"
- fi
-
-
# Checks for user options
echo "$as_me:$LINENO: checking for compile with diagnostic messages" >&5
--- 4680,4683 ----
***************
*** 4673,4708 ****
fi
- echo "$as_me:$LINENO: checking for manual rebuild" >&5
- echo $ECHO_N "checking for manual rebuild... $ECHO_C" >&6
- # Check whether --enable-manual or --disable-manual was given.
- if test "${enable_manual+set}" = set; then
- enableval="$enable_manual"
- enable_manual="yes"
- else
- enable_manual="no"
- fi;
- echo "$as_me:$LINENO: result: $enable_manual" >&5
- echo "${ECHO_T}$enable_manual" >&6
-
- if test "$dbook2man" = "no"; then
- sleep 1
- fi
-
- if test "$ac_check_dist" = "yes"; then
- if test "$dbook2man" = "no"; then
- { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot prepare manual" >&5
- echo "$as_me: error: docbook-to-man not found, cannot prepare manual" >&2;}
- { (exit 1); exit 1; }; }
- fi
- else
- if test "$enable_manual" = "yes"; then
- if test "$dbook2man" = "no"; then
- { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot build manual" >&5
- echo "$as_me: error: docbook-to-man not found, cannot build manual" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
- fi
-
--- 4699,4702 ----
***************
*** 5427,5430 ****
--- 5421,5425 ----
s,@AWK@,$AWK,;t t
s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@dbook2man@,$dbook2man,;t t
s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
***************
*** 5447,5451 ****
s,@LEXLIB@,$LEXLIB,;t t
s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
- s,@dbook2man@,$dbook2man,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
--- 5442,5445 ----
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.ac 6 Feb 2003 23:34:05 -0000 1.7
--- configure.ac 7 Feb 2003 09:58:47 -0000 1.8
***************
*** 12,15 ****
--- 12,38 ----
AM_CONFIG_HEADER(src/config.h)
+ # Checks for manual building
+ AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
+ AC_CHECK_FILE([${srcdir}/distributed-package],[ac_check_dist="yes"],[ac_check_dist="no"])
+ AC_MSG_CHECKING(for manual rebuild)
+ AC_ARG_ENABLE(manual,
+ AC_HELP_STRING(
+ [--enable-manual],
+ [Building manual from sgml, require docbook-to-man]),
+ [enable_manual="yes"],[enable_manual="no"])
+ AC_MSG_RESULT($enable_manual)
+
+ if test "$ac_check_dist" = "yes"; then
+ if test "$enable_manual" = "yes"; then
+ if test "$dbook2man" = "no"; then
+ AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
+ fi
+ fi
+ else
+ if test "$dbook2man" = "no"; then
+ AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual])
+ fi
+ fi
+
# Checks for programs.
AC_PROG_CC
***************
*** 18,23 ****
AM_PROG_LEX
- AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
-
# Checks for header files.
AC_HEADER_STDC
--- 41,44 ----
***************
*** 48,54 ****
[Define to 1 if you want to compile with debug support.])
- # Checks for special file in distribution package
- AC_CHECK_FILE([${srcdir}/distributed-package],[ac_check_dist="yes"],[ac_check_dist="no"])
-
# Checks for user options
AC_MSG_CHECKING(for compile with diagnostic messages)
--- 69,72 ----
***************
*** 59,86 ****
if test "$enable_debug" = "yes"; then
AC_DEFINE(DEBUG)
- fi
-
- AC_MSG_CHECKING(for manual rebuild)
- AC_ARG_ENABLE(manual,
- AC_HELP_STRING(
- [--enable-manual],
- [Building manual from sgml, require docbook-to-man]),
- [enable_manual="yes"],[enable_manual="no"])
- AC_MSG_RESULT($enable_manual)
-
- if test "$dbook2man" = "no"; then
- sleep 1
- fi
-
- if test "$ac_check_dist" = "yes"; then
- if test "$dbook2man" = "no"; then
- AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual])
- fi
- else
- if test "$enable_manual" = "yes"; then
- if test "$dbook2man" = "no"; then
- AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
- fi
- fi
fi
--- 77,80 ----
|
|
From: <ar...@us...> - 2003-02-07 09:58:52
|
Update of /cvsroot/lwatch/files/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv5584/doc
Modified Files:
Makefile.am Makefile.in
Log Message:
- configure.ac: first check for components which are required for build,
next other tests
- doc/Makefile.am: proper conditional to make "make dist" and "make install"
works
- other: automagically regenerated
Index: Makefile.am
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am 6 Feb 2003 23:34:05 -0000 1.9
--- Makefile.am 7 Feb 2003 09:58:47 -0000 1.10
***************
*** 1,3 ****
! man_MANS = @DOCMAN@
dist_man_MANS = @DISTMAN@
EXTRA_DIST = lwatch.sgml
--- 1,5 ----
! if DISTRO
! man_MANS = lwatch.1
! endif
dist_man_MANS = @DISTMAN@
EXTRA_DIST = lwatch.sgml
***************
*** 12,16 ****
sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
else
! lwatch.1: lwatch.1.in
sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
endif
--- 14,18 ----
sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
else
! lwatch.1: lwatch.1.in Makefile
sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
endif
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.in 6 Feb 2003 23:34:05 -0000 1.9
--- Makefile.in 7 Feb 2003 09:58:48 -0000 1.10
***************
*** 116,120 ****
sysconfdir = @sysconfdir@
target_alias = @target_alias@
! man_MANS = @DOCMAN@
dist_man_MANS = @DISTMAN@
EXTRA_DIST = lwatch.sgml
--- 116,120 ----
sysconfdir = @sysconfdir@
target_alias = @target_alias@
! @DISTRO_TRUE@man_MANS = lwatch.1
dist_man_MANS = @DISTMAN@
EXTRA_DIST = lwatch.sgml
***************
*** 125,128 ****
--- 125,131 ----
CONFIG_CLEAN_FILES =
DIST_SOURCES =
+
+ NROFF = nroff
+ MANS = $(dist_man_MANS) $(man_MANS)
DIST_COMMON = $(dist_man_MANS) Makefile.am Makefile.in
all: all-am
***************
*** 135,138 ****
--- 138,188 ----
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
uninstall-info-am:
+
+ man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(man1dir)
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ else file=$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ done
+ uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+ rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ done
tags: TAGS
TAGS:
***************
*** 175,181 ****
check-am: all-am
check: check-am
! all-am: Makefile
installdirs:
install: install-am
--- 225,232 ----
check-am: all-am
check: check-am
! all-am: Makefile $(MANS)
installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(man1dir)
install: install-am
***************
*** 220,224 ****
info-am:
! install-data-am:
install-exec-am:
--- 271,275 ----
info-am:
! install-data-am: install-man
install-exec-am:
***************
*** 226,230 ****
install-info: install-info-am
! install-man:
installcheck-am:
--- 277,281 ----
install-info: install-info-am
! install-man: install-man1
installcheck-am:
***************
*** 246,250 ****
ps-am:
! uninstall-am: uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
--- 297,303 ----
ps-am:
! uninstall-am: uninstall-info-am uninstall-man
!
! uninstall-man: uninstall-man1
.PHONY: all all-am check check-am clean clean-generic distclean \
***************
*** 252,259 ****
install-am install-data install-data-am 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \
! uninstall-info-am
--- 305,312 ----
install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
! install-man1 install-strip installcheck installcheck-am \
! installdirs maintainer-clean maintainer-clean-generic \
! mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
! uninstall-am uninstall-info-am uninstall-man uninstall-man1
***************
*** 263,267 ****
@DISTRO_TRUE@@MAK...@co...: conf.ent.in Makefile
@DISTRO_TRUE@@MAKE_MAN_TRUE@ sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
! @DISTRO_TRUE@@MAKE_MAN_FALSE@lwatch.1: lwatch.1.in
@DISTRO_TRUE@@MAKE_MAN_FALSE@ sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
@DIS...@lw...: lwatch.sgml conf.ent
--- 316,320 ----
@DISTRO_TRUE@@MAK...@co...: conf.ent.in Makefile
@DISTRO_TRUE@@MAKE_MAN_TRUE@ sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
! @DISTRO_TRUE@@MAKE_MAN_FALSE@lwatch.1: lwatch.1.in Makefile
@DISTRO_TRUE@@MAKE_MAN_FALSE@ sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
@DIS...@lw...: lwatch.sgml conf.ent
|
|
From: <ar...@us...> - 2003-02-06 23:34:09
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv5251
Modified Files:
Makefile.in configure configure.ac
Log Message:
- configure.ac, doc/Makefile.am: some magic with manual rebuilding[1]
- other: automagicaly rebuilded
[1] If sources are get from CVS I assume that I'm in maintainter mode.
That's mean some tools (i.e. doxbook-to-man) are available. In this
mode I can create lwatch.1.in from lwatch.sgml, which is manual with
@VARIABLES@.
If sources are get from distributed tarball I assume that I have
lwatch.1.in and I replace all @VARIABLES@ with proper values.
Kinda magic, isn't it?
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile.in 4 Feb 2003 23:29:57 -0000 1.11
--- Makefile.in 6 Feb 2003 23:34:05 -0000 1.12
***************
*** 52,55 ****
--- 52,59 ----
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ DISTMAN = @DISTMAN@
+ DISTRO_FALSE = @DISTRO_FALSE@
+ DISTRO_TRUE = @DISTRO_TRUE@
+ DOCMAN = @DOCMAN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
***************
*** 57,60 ****
--- 61,66 ----
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ HAVE_D2M_FALSE = @HAVE_D2M_FALSE@
+ HAVE_D2M_TRUE = @HAVE_D2M_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
***************
*** 70,73 ****
--- 76,81 ----
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+ MAKE_MAN_FALSE = @MAKE_MAN_FALSE@
+ MAKE_MAN_TRUE = @MAKE_MAN_TRUE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configure 5 Feb 2003 16:52:46 -0000 1.10
--- configure 6 Feb 2003 23:34:05 -0000 1.11
***************
*** 1,4 ****
#! /bin/sh
! # From configure.ac Revision: 1.5 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
--- 1,4 ----
#! /bin/sh
! # From configure.ac Revision: 1.6 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
***************
*** 310,314 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S LEX LEXLIB LEX_OUTPUT_ROOT dbook2man CPP EGREP LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 310,314 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S LEX LEXLIB LEX_OUTPUT_ROOT dbook2man CPP EGREP LIBOBJS DISTRO_TRUE DISTRO_FALSE MAKE_MAN_TRUE MAKE_MAN_FALSE HAVE_D2M_TRUE HAVE_D2M_FALSE DOCMAN DISTMAN LTLIBOBJS'
ac_subst_files=''
***************
*** 851,854 ****
--- 851,855 ----
--enable-dependency-tracking Do not reject slow dependency extractors
--enable-debug Compile with diagnostic messages
+ --enable-manual Building manual from sgml, require docbook-to-man
Some influential environment variables:
***************
*** 3058,3062 ****
done
! test -z "$ac_cv_path_dbook2man" && ac_cv_path_dbook2man="none"
;;
esac
--- 3059,3063 ----
done
! test -z "$ac_cv_path_dbook2man" && ac_cv_path_dbook2man="no"
;;
esac
***************
*** 3697,3707 ****
# Take fun :)
! echo "$as_me:$LINENO: checking Kenny for life signals" >&5
! echo $ECHO_N "checking Kenny for life signals... $ECHO_C" >&6
sleep 1
- echo "$as_me:$LINENO: result: no life signals.
- BASTARD! You killed Kenny!" >&5
- echo "${ECHO_T}no life signals.
- BASTARD! You killed Kenny!" >&6
# Checks for libraries.
--- 3698,3709 ----
# Take fun :)
! echo "$as_me:$LINENO: checking civilization" >&5
! echo $ECHO_N "checking civilization... $ECHO_C" >&6
! sleep 1
! echo "$as_me:$LINENO: result: other." >&5
! echo "${ECHO_T}other." >&6
! echo "$as_me:$LINENO: result: We are lwatch of Borg. You will be asimilated. Resistance is futile" >&5
! echo "${ECHO_T}We are lwatch of Borg. You will be asimilated. Resistance is futile" >&6
sleep 1
# Checks for libraries.
***************
*** 4626,4629 ****
--- 4628,4657 ----
+ # Checks for special file in distribution package
+ as_ac_File=`echo "ac_cv_file_${srcdir}/distributed-package" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for ${srcdir}/distributed-package" >&5
+ echo $ECHO_N "checking for ${srcdir}/distributed-package... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_File+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+ echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+ if test -r "${srcdir}/distributed-package"; then
+ eval "$as_ac_File=yes"
+ else
+ eval "$as_ac_File=no"
+ fi
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+ if test `eval echo '${'$as_ac_File'}'` = yes; then
+ ac_check_dist="yes"
+ else
+ ac_check_dist="no"
+ fi
+
+
# Checks for user options
echo "$as_me:$LINENO: checking for compile with diagnostic messages" >&5
***************
*** 4645,4648 ****
--- 4673,4750 ----
fi
+ echo "$as_me:$LINENO: checking for manual rebuild" >&5
+ echo $ECHO_N "checking for manual rebuild... $ECHO_C" >&6
+ # Check whether --enable-manual or --disable-manual was given.
+ if test "${enable_manual+set}" = set; then
+ enableval="$enable_manual"
+ enable_manual="yes"
+ else
+ enable_manual="no"
+ fi;
+ echo "$as_me:$LINENO: result: $enable_manual" >&5
+ echo "${ECHO_T}$enable_manual" >&6
+
+ if test "$dbook2man" = "no"; then
+ sleep 1
+ fi
+
+ if test "$ac_check_dist" = "yes"; then
+ if test "$dbook2man" = "no"; then
+ { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot prepare manual" >&5
+ echo "$as_me: error: docbook-to-man not found, cannot prepare manual" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ else
+ if test "$enable_manual" = "yes"; then
+ if test "$dbook2man" = "no"; then
+ { { echo "$as_me:$LINENO: error: docbook-to-man not found, cannot build manual" >&5
+ echo "$as_me: error: docbook-to-man not found, cannot build manual" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+ fi
+
+
+
+ if test "$ac_check_dist" = "yes"; then
+ DISTRO_TRUE=
+ DISTRO_FALSE='#'
+ else
+ DISTRO_TRUE='#'
+ DISTRO_FALSE=
+ fi
+
+
+
+ if test "$enable_manual" = "yes"; then
+ MAKE_MAN_TRUE=
+ MAKE_MAN_FALSE='#'
+ else
+ MAKE_MAN_TRUE='#'
+ MAKE_MAN_FALSE=
+ fi
+
+
+
+ if test "$dbook2man" = "yes"; then
+ HAVE_D2M_TRUE=
+ HAVE_D2M_FALSE='#'
+ else
+ HAVE_D2M_TRUE='#'
+ HAVE_D2M_FALSE=
+ fi
+
+
+ if test "$ac_check_dist" = "yes"; then
+ DOCMAN=lwatch.1
+ DISTMAN=
+ else
+ DOCMAN=
+ DISTMAN=lwatch.1.in
+ fi
+
+
+
+
# Epilog
ac_config_files="$ac_config_files src/Makefile doc/Makefile Makefile"
***************
*** 4753,4756 ****
--- 4855,4879 ----
{ (exit 1); exit 1; }; }
fi
+ if test -z "${DISTRO_TRUE}" && test -z "${DISTRO_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"DISTRO\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"DISTRO\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${MAKE_MAN_TRUE}" && test -z "${MAKE_MAN_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"MAKE_MAN\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"MAKE_MAN\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ if test -z "${HAVE_D2M_TRUE}" && test -z "${HAVE_D2M_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_D2M\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"HAVE_D2M\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
: ${CONFIG_STATUS=./config.status}
***************
*** 5328,5331 ****
--- 5451,5462 ----
s,@EGREP@,$EGREP,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@DISTRO_TRUE@,$DISTRO_TRUE,;t t
+ s,@DISTRO_FALSE@,$DISTRO_FALSE,;t t
+ s,@MAKE_MAN_TRUE@,$MAKE_MAN_TRUE,;t t
+ s,@MAKE_MAN_FALSE@,$MAKE_MAN_FALSE,;t t
+ s,@HAVE_D2M_TRUE@,$HAVE_D2M_TRUE,;t t
+ s,@HAVE_D2M_FALSE@,$HAVE_D2M_FALSE,;t t
+ s,@DOCMAN@,$DOCMAN,;t t
+ s,@DISTMAN@,$DISTMAN,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.ac 5 Feb 2003 16:52:47 -0000 1.6
--- configure.ac 6 Feb 2003 23:34:05 -0000 1.7
***************
*** 18,22 ****
AM_PROG_LEX
! AC_PATH_PROG(dbook2man,[docbook-to-man],[none])
# Checks for header files.
--- 18,22 ----
AM_PROG_LEX
! AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
# Checks for header files.
***************
*** 25,32 ****
# Take fun :)
! AC_MSG_CHECKING(Kenny for life signals)
sleep 1
- AC_MSG_RESULT([no life signals.
- BASTARD! You killed Kenny!])
# Checks for libraries.
--- 25,33 ----
# Take fun :)
! AC_MSG_CHECKING(civilization)
! sleep 1
! AC_MSG_RESULT([other.])
! AC_MSG_RESULT([We are lwatch of Borg. You will be asimilated. Resistance is futile])
sleep 1
# Checks for libraries.
***************
*** 47,54 ****
[Define to 1 if you want to compile with debug support.])
# Checks for user options
AC_MSG_CHECKING(for compile with diagnostic messages)
AC_ARG_ENABLE(debug,
! [ --enable-debug Compile with diagnostic messages], ,
[enable_debug="no"])
AC_MSG_RESULT($enable_debug)
--- 48,58 ----
[Define to 1 if you want to compile with debug support.])
+ # Checks for special file in distribution package
+ AC_CHECK_FILE([${srcdir}/distributed-package],[ac_check_dist="yes"],[ac_check_dist="no"])
+
# Checks for user options
AC_MSG_CHECKING(for compile with diagnostic messages)
AC_ARG_ENABLE(debug,
! AC_HELP_STRING([--enable-debug],[Compile with diagnostic messages]), ,
[enable_debug="no"])
AC_MSG_RESULT($enable_debug)
***************
*** 56,59 ****
--- 60,102 ----
AC_DEFINE(DEBUG)
fi
+
+ AC_MSG_CHECKING(for manual rebuild)
+ AC_ARG_ENABLE(manual,
+ AC_HELP_STRING(
+ [--enable-manual],
+ [Building manual from sgml, require docbook-to-man]),
+ [enable_manual="yes"],[enable_manual="no"])
+ AC_MSG_RESULT($enable_manual)
+
+ if test "$dbook2man" = "no"; then
+ sleep 1
+ fi
+
+ if test "$ac_check_dist" = "yes"; then
+ if test "$dbook2man" = "no"; then
+ AC_MSG_ERROR([docbook-to-man not found, cannot prepare manual])
+ fi
+ else
+ if test "$enable_manual" = "yes"; then
+ if test "$dbook2man" = "no"; then
+ AC_MSG_ERROR([docbook-to-man not found, cannot build manual])
+ fi
+ fi
+ fi
+
+ AM_CONDITIONAL(DISTRO, test "$ac_check_dist" = "yes")
+ AM_CONDITIONAL(MAKE_MAN, test "$enable_manual" = "yes")
+ AM_CONDITIONAL(HAVE_D2M, test "$dbook2man" = "yes")
+
+ if test "$ac_check_dist" = "yes"; then
+ DOCMAN=lwatch.1
+ DISTMAN=
+ else
+ DOCMAN=
+ DISTMAN=lwatch.1.in
+ fi
+
+ AC_SUBST([DOCMAN])
+ AC_SUBST([DISTMAN])
# Epilog
|
|
From: <ar...@us...> - 2003-02-06 23:34:09
|
Update of /cvsroot/lwatch/files/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv5251/doc
Modified Files:
Makefile.am Makefile.in
Log Message:
- configure.ac, doc/Makefile.am: some magic with manual rebuilding[1]
- other: automagicaly rebuilded
[1] If sources are get from CVS I assume that I'm in maintainter mode.
That's mean some tools (i.e. doxbook-to-man) are available. In this
mode I can create lwatch.1.in from lwatch.sgml, which is manual with
@VARIABLES@.
If sources are get from distributed tarball I assume that I have
lwatch.1.in and I replace all @VARIABLES@ with proper values.
Kinda magic, isn't it?
Index: Makefile.am
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.am 4 Feb 2003 23:29:58 -0000 1.8
--- Makefile.am 6 Feb 2003 23:34:05 -0000 1.9
***************
*** 1,9 ****
! dist_man_MANS = lwatch.1
! EXTRA_DIST = lwatch.sgml conf.ent.in
! CLEANFILES = lwatch.1 conf.ent
conf.ent: conf.ent.in Makefile
sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
! lwatch.1: lwatch.sgml conf.ent
! $(dbook2man) lwatch.sgml > lwatch.1
--- 1,23 ----
! man_MANS = @DOCMAN@
! dist_man_MANS = @DISTMAN@
! EXTRA_DIST = lwatch.sgml
! CLEANFILES = lwatch.1 conf.ent @DOCMAN@ @DISTMAN@
!
! if DISTRO
! if MAKE_MAN
! lwatch.1: lwatch.sgml conf.ent
! $(dbook2man) lwatch.sgml > lwatch.1
conf.ent: conf.ent.in Makefile
sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
+ else
+ lwatch.1: lwatch.1.in
+ sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
+ endif
+ else
+ lwatch.1.in: lwatch.sgml conf.ent
+ $(dbook2man) lwatch.sgml > lwatch.1.in
! conf.ent: conf.ent.in
! cp conf.ent.in conf.ent
! endif
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.in 4 Feb 2003 23:29:59 -0000 1.8
--- Makefile.in 6 Feb 2003 23:34:05 -0000 1.9
***************
*** 52,55 ****
--- 52,59 ----
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ DISTMAN = @DISTMAN@
+ DISTRO_FALSE = @DISTRO_FALSE@
+ DISTRO_TRUE = @DISTRO_TRUE@
+ DOCMAN = @DOCMAN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
***************
*** 57,60 ****
--- 61,66 ----
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ HAVE_D2M_FALSE = @HAVE_D2M_FALSE@
+ HAVE_D2M_TRUE = @HAVE_D2M_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
***************
*** 70,73 ****
--- 76,81 ----
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+ MAKE_MAN_FALSE = @MAKE_MAN_FALSE@
+ MAKE_MAN_TRUE = @MAKE_MAN_TRUE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
***************
*** 108,114 ****
sysconfdir = @sysconfdir@
target_alias = @target_alias@
! dist_man_MANS = lwatch.1
! EXTRA_DIST = lwatch.sgml conf.ent.in
! CLEANFILES = lwatch.1 conf.ent
subdir = doc
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 116,123 ----
sysconfdir = @sysconfdir@
target_alias = @target_alias@
! man_MANS = @DOCMAN@
! dist_man_MANS = @DISTMAN@
! EXTRA_DIST = lwatch.sgml
! CLEANFILES = lwatch.1 conf.ent @DOCMAN@ @DISTMAN@
subdir = doc
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
***************
*** 116,122 ****
CONFIG_CLEAN_FILES =
DIST_SOURCES =
-
- NROFF = nroff
- MANS = $(dist_man_MANS)
DIST_COMMON = $(dist_man_MANS) Makefile.am Makefile.in
all: all-am
--- 125,128 ----
***************
*** 129,179 ****
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
uninstall-info-am:
-
- man1dir = $(mandir)/man1
- install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(man1dir)
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
- case "$$i" in \
- *.1*) list="$$list $$i" ;; \
- esac; \
- done; \
- for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
- *) ext='1' ;; \
- esac; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
- done
- uninstall-man1:
- @$(NORMAL_UNINSTALL)
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
- case "$$i" in \
- *.1*) list="$$list $$i" ;; \
- esac; \
- done; \
- for i in $$list; do \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
- *) ext='1' ;; \
- esac; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
- rm -f $(DESTDIR)$(man1dir)/$$inst; \
- done
tags: TAGS
TAGS:
--- 135,138 ----
***************
*** 216,223 ****
check-am: all-am
check: check-am
! all-am: Makefile $(MANS)
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(man1dir)
install: install-am
--- 175,181 ----
check-am: all-am
check: check-am
! all-am: Makefile
installdirs:
install: install-am
***************
*** 262,266 ****
info-am:
! install-data-am: install-man
install-exec-am:
--- 220,224 ----
info-am:
! install-data-am:
install-exec-am:
***************
*** 268,272 ****
install-info: install-info-am
! install-man: install-man1
installcheck-am:
--- 226,230 ----
install-info: install-info-am
! install-man:
installcheck-am:
***************
*** 288,294 ****
ps-am:
! uninstall-am: uninstall-info-am uninstall-man
!
! uninstall-man: uninstall-man1
.PHONY: all all-am check check-am clean clean-generic distclean \
--- 246,250 ----
ps-am:
! uninstall-am: uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic distclean \
***************
*** 296,310 ****
install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
! install-man1 install-strip installcheck installcheck-am \
! installdirs maintainer-clean maintainer-clean-generic \
! mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
! uninstall-am uninstall-info-am uninstall-man uninstall-man1
! conf.ent: conf.ent.in Makefile
! sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
! lwatch.1: lwatch.sgml conf.ent
! $(dbook2man) lwatch.sgml > lwatch.1
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- 252,273 ----
install-am install-data install-data-am 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-generic pdf pdf-am ps ps-am uninstall uninstall-am \
! uninstall-info-am
! @DISTRO_TRUE@@MAKE_MAN_TRUE@lwatch.1: lwatch.sgml conf.ent
! @DISTRO_TRUE@@MAKE_MAN_TRUE@ $(dbook2man) lwatch.sgml > lwatch.1
! @DISTRO_TRUE@@MAK...@co...: conf.ent.in Makefile
! @DISTRO_TRUE@@MAKE_MAN_TRUE@ sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent
! @DISTRO_TRUE@@MAKE_MAN_FALSE@lwatch.1: lwatch.1.in
! @DISTRO_TRUE@@MAKE_MAN_FALSE@ sed "s#@CONFDIR\@#$(sysconfdir)#g" < lwatch.1.in > lwatch.1
! @DIS...@lw...: lwatch.sgml conf.ent
! @DISTRO_FALSE@ $(dbook2man) lwatch.sgml > lwatch.1.in
!
! @DIS...@co...: conf.ent.in
! @DISTRO_FALSE@ cp conf.ent.in conf.ent
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
From: <ar...@us...> - 2003-02-06 23:34:09
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5251/src
Modified Files:
Makefile.in
Log Message:
- configure.ac, doc/Makefile.am: some magic with manual rebuilding[1]
- other: automagicaly rebuilded
[1] If sources are get from CVS I assume that I'm in maintainter mode.
That's mean some tools (i.e. doxbook-to-man) are available. In this
mode I can create lwatch.1.in from lwatch.sgml, which is manual with
@VARIABLES@.
If sources are get from distributed tarball I assume that I have
lwatch.1.in and I replace all @VARIABLES@ with proper values.
Kinda magic, isn't it?
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.in 4 Feb 2003 23:29:59 -0000 1.9
--- Makefile.in 6 Feb 2003 23:34:05 -0000 1.10
***************
*** 52,55 ****
--- 52,59 ----
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ DISTMAN = @DISTMAN@
+ DISTRO_FALSE = @DISTRO_FALSE@
+ DISTRO_TRUE = @DISTRO_TRUE@
+ DOCMAN = @DOCMAN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
***************
*** 57,60 ****
--- 61,66 ----
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+ HAVE_D2M_FALSE = @HAVE_D2M_FALSE@
+ HAVE_D2M_TRUE = @HAVE_D2M_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
***************
*** 70,73 ****
--- 76,81 ----
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+ MAKE_MAN_FALSE = @MAKE_MAN_FALSE@
+ MAKE_MAN_TRUE = @MAKE_MAN_TRUE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
|
|
From: <ar...@us...> - 2003-02-05 16:52:52
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv27033
Modified Files:
configure configure.ac
Log Message:
- Bastard! You killed Keny!
- change message for --enable-debug
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configure 4 Feb 2003 23:29:57 -0000 1.9
--- configure 5 Feb 2003 16:52:46 -0000 1.10
***************
*** 1,4 ****
#! /bin/sh
! # From configure.ac Revision: .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
--- 1,4 ----
#! /bin/sh
! # From configure.ac Revision: 1.5 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
***************
*** 850,854 ****
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
! --enable-debug Use debugging
Some influential environment variables:
--- 850,854 ----
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
! --enable-debug Compile with diagnostic messages
Some influential environment variables:
***************
*** 3696,3699 ****
--- 3696,3708 ----
+ # Take fun :)
+ echo "$as_me:$LINENO: checking Kenny for life signals" >&5
+ echo $ECHO_N "checking Kenny for life signals... $ECHO_C" >&6
+ sleep 1
+ echo "$as_me:$LINENO: result: no life signals.
+ BASTARD! You killed Kenny!" >&5
+ echo "${ECHO_T}no life signals.
+ BASTARD! You killed Kenny!" >&6
+
# Checks for libraries.
***************
*** 4618,4623 ****
# Checks for user options
! echo "$as_me:$LINENO: checking --enable-debug" >&5
! echo $ECHO_N "checking --enable-debug... $ECHO_C" >&6
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
--- 4627,4632 ----
# Checks for user options
! echo "$as_me:$LINENO: checking for compile with diagnostic messages" >&5
! echo $ECHO_N "checking for compile with diagnostic messages... $ECHO_C" >&6
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure.ac 4 Feb 2003 23:29:57 -0000 1.5
--- configure.ac 5 Feb 2003 16:52:47 -0000 1.6
***************
*** 24,27 ****
--- 24,33 ----
AC_CHECK_HEADERS([fcntl.h stddef.h stdlib.h string.h sys/param.h unistd.h pcre.h])
+ # Take fun :)
+ AC_MSG_CHECKING(Kenny for life signals)
+ sleep 1
+ AC_MSG_RESULT([no life signals.
+ BASTARD! You killed Kenny!])
+
# Checks for libraries.
AC_CHECK_LIB([pcre], [pcre_version],, AC_MSG_ERROR([Error: libpcre not installed. Install first. ]))
***************
*** 42,48 ****
# Checks for user options
! AC_MSG_CHECKING(--enable-debug)
AC_ARG_ENABLE(debug,
! [ --enable-debug Use debugging], ,
[enable_debug="no"])
AC_MSG_RESULT($enable_debug)
--- 48,54 ----
# Checks for user options
! AC_MSG_CHECKING(for compile with diagnostic messages)
AC_ARG_ENABLE(debug,
! [ --enable-debug Compile with diagnostic messages], ,
[enable_debug="no"])
AC_MSG_RESULT($enable_debug)
|
|
From: <ar...@us...> - 2003-02-04 23:30:03
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11581/src
Modified Files:
Makefile.in config.h.in
Log Message:
* configure.ac: add Revision to configure, checking for docbook-to-man,
support for --enable-debug
* doc/Makefile.am: run $(dbook2man) instead docbook-to-man
* Makefile.in, configure, doc/Makefile.in, src/Makefile.in, src/config.h.in:
automagically recreated
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.in 3 Feb 2003 23:37:36 -0000 1.8
--- Makefile.in 4 Feb 2003 23:29:59 -0000 1.9
***************
*** 91,94 ****
--- 91,95 ----
build_alias = @build_alias@
datadir = @datadir@
+ dbook2man = @dbook2man@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
Index: config.h.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/config.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.h.in 3 Feb 2003 23:37:36 -0000 1.6
--- config.h.in 4 Feb 2003 23:29:59 -0000 1.7
***************
*** 1,4 ****
--- 1,7 ----
/* 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
|
|
From: <ar...@us...> - 2003-02-04 23:30:02
|
Update of /cvsroot/lwatch/files/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv11581/doc
Modified Files:
Makefile.am Makefile.in
Log Message:
* configure.ac: add Revision to configure, checking for docbook-to-man,
support for --enable-debug
* doc/Makefile.am: run $(dbook2man) instead docbook-to-man
* Makefile.in, configure, doc/Makefile.in, src/Makefile.in, src/config.h.in:
automagically recreated
Index: Makefile.am
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am 3 Feb 2003 23:37:36 -0000 1.7
--- Makefile.am 4 Feb 2003 23:29:58 -0000 1.8
***************
*** 7,9 ****
lwatch.1: lwatch.sgml conf.ent
! docbook-to-man lwatch.sgml > lwatch.1
--- 7,9 ----
lwatch.1: lwatch.sgml conf.ent
! $(dbook2man) lwatch.sgml > lwatch.1
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in 3 Feb 2003 23:37:36 -0000 1.7
--- Makefile.in 4 Feb 2003 23:29:59 -0000 1.8
***************
*** 91,94 ****
--- 91,95 ----
build_alias = @build_alias@
datadir = @datadir@
+ dbook2man = @dbook2man@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
***************
*** 305,309 ****
lwatch.1: lwatch.sgml conf.ent
! docbook-to-man lwatch.sgml > lwatch.1
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- 306,310 ----
lwatch.1: lwatch.sgml conf.ent
! $(dbook2man) lwatch.sgml > lwatch.1
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
From: <ar...@us...> - 2003-02-04 23:30:01
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv11581
Modified Files:
Makefile.in configure configure.ac
Log Message:
* configure.ac: add Revision to configure, checking for docbook-to-man,
support for --enable-debug
* doc/Makefile.am: run $(dbook2man) instead docbook-to-man
* Makefile.in, configure, doc/Makefile.in, src/Makefile.in, src/config.h.in:
automagically recreated
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile.in 3 Feb 2003 23:37:35 -0000 1.10
--- Makefile.in 4 Feb 2003 23:29:57 -0000 1.11
***************
*** 91,94 ****
--- 91,95 ----
build_alias = @build_alias@
datadir = @datadir@
+ dbook2man = @dbook2man@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure 3 Feb 2003 23:37:35 -0000 1.8
--- configure 4 Feb 2003 23:29:57 -0000 1.9
***************
*** 1,3 ****
--- 1,4 ----
#! /bin/sh
+ # From configure.ac Revision: .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
***************
*** 309,313 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S LEX LEXLIB LEX_OUTPUT_ROOT CPP EGREP LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 310,314 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S LEX LEXLIB LEX_OUTPUT_ROOT dbook2man CPP EGREP LIBOBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 849,852 ****
--- 850,854 ----
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
+ --enable-debug Use debugging
Some influential environment variables:
***************
*** 1276,1279 ****
--- 1278,1282 ----
+
am__api_version="1.7"
ac_aux_dir=
***************
*** 3029,3032 ****
--- 3032,3076 ----
fi
+ # Extract the first word of "docbook-to-man", so it can be a program name with args.
+ set dummy docbook-to-man; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_dbook2man+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $dbook2man in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_dbook2man="$dbook2man" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_dbook2man="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
+ test -z "$ac_cv_path_dbook2man" && ac_cv_path_dbook2man="none"
+ ;;
+ esac
+ fi
+ dbook2man=$ac_cv_path_dbook2man
+
+ if test -n "$dbook2man"; then
+ echo "$as_me:$LINENO: result: $dbook2man" >&5
+ echo "${ECHO_T}$dbook2man" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+
# Checks for header files.
ac_ext=c
***************
*** 4569,4572 ****
--- 4613,4639 ----
+ # Define autoheader templates
+
+
+
+ # Checks for user options
+ echo "$as_me:$LINENO: checking --enable-debug" >&5
+ echo $ECHO_N "checking --enable-debug... $ECHO_C" >&6
+ # Check whether --enable-debug or --disable-debug was given.
+ if test "${enable_debug+set}" = set; then
+ enableval="$enable_debug"
+
+ else
+ enable_debug="no"
+ fi;
+ echo "$as_me:$LINENO: result: $enable_debug" >&5
+ echo "${ECHO_T}$enable_debug" >&6
+ if test "$enable_debug" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+ #define DEBUG 1
+ _ACEOF
+
+ fi
+
# Epilog
ac_config_files="$ac_config_files src/Makefile doc/Makefile Makefile"
***************
*** 5248,5251 ****
--- 5315,5319 ----
s,@LEXLIB@,$LEXLIB,;t t
s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
+ s,@dbook2man@,$dbook2man,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.ac 3 Feb 2003 23:37:35 -0000 1.4
--- configure.ac 4 Feb 2003 23:29:57 -0000 1.5
***************
*** 6,9 ****
--- 6,10 ----
AC_PREREQ(2.57)
AC_INIT([lwatch], [0.1])
+ AC_REVISION($Revision$)
AC_CONFIG_SRCDIR(src/lwatch.c)
AM_INIT_AUTOMAKE([dist-bzip2])
***************
*** 17,20 ****
--- 18,23 ----
AM_PROG_LEX
+ AC_PATH_PROG(dbook2man,[docbook-to-man],[none])
+
# Checks for header files.
AC_HEADER_STDC
***************
*** 33,36 ****
--- 36,53 ----
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([memset strcasecmp strchr])
+
+ # Define autoheader templates
+ AH_TEMPLATE([DEBUG],
+ [Define to 1 if you want to compile with debug support.])
+
+ # Checks for user options
+ AC_MSG_CHECKING(--enable-debug)
+ AC_ARG_ENABLE(debug,
+ [ --enable-debug Use debugging], ,
+ [enable_debug="no"])
+ AC_MSG_RESULT($enable_debug)
+ if test "$enable_debug" = "yes"; then
+ AC_DEFINE(DEBUG)
+ fi
# Epilog
|
|
From: <ar...@us...> - 2003-02-04 23:23:52
|
Update of /cvsroot/lwatch/files/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv9275
Modified Files:
lwatch.sgml
Log Message:
- some language correction
Index: lwatch.sgml
===================================================================
RCS file: /cvsroot/lwatch/files/doc/lwatch.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** lwatch.sgml 30 Sep 2002 10:31:15 -0000 1.6
--- lwatch.sgml 4 Feb 2003 23:23:49 -0000 1.7
***************
*** 36,40 ****
<refentry>
! <!-- WTF?
<refentryinfo>
<address>
--- 36,40 ----
<refentry>
! <!-- WTF is it?
<refentryinfo>
<address>
***************
*** 79,83 ****
<para>The lwatch is a log colorizer. It reads syslog/syslog-ng data
! from named fifo or from stdin and display colored logs into
stdout.</para>
--- 79,83 ----
<para>The lwatch is a log colorizer. It reads syslog/syslog-ng data
! from named fifo or from stdin and displays colored logs into
stdout.</para>
***************
*** 86,96 ****
<option>-C</option></para>
! <para>The way it works is simple. It reads a line from input, split it
into four parts: date, hostname, service name (with PID, if available)
! and real message. Each part has own default color. You can redefine them
! in configuration file. Default colors as the same as in loco(1) [see: http://zjuul.net/~jules/loco/]. But lwatch is not only static log colorizer. It is
! something more. It can colorize your logs that way, as you wish. You are
! able to set a new color for any part (date, host, service, message) using
! regexp based patterns.</para>
</refsect1>
--- 86,97 ----
<option>-C</option></para>
! <para>The way it works is simple. It reads a line from input, splits it
into four parts: date, hostname, service name (with PID, if available)
! and real message. Each part has its own default color. You can redefine
! them in configuration file. Default colors as the same as in loco(1)
! [see: http://zjuul.net/~jules/loco/]. But lwatch is not only a static log
! colorizer. It is something more. It can colorize your logs any way
! you wish. You are able to set a new color for any part (date, host,
! service, message) using regexp based patterns.</para>
</refsect1>
***************
*** 98,106 ****
<refsect1>
<title>Configuration file</title>
! <para>There is no documentation for configuration file for now. Look at
! provided file, there are a lot of comments inside.</para>
<para>I am going to make some changes in configuration file before
! 1.0-stable release. I will also provide docs about configure lwatch in this
! release.</para>
</refsect1>
--- 99,107 ----
<refsect1>
<title>Configuration file</title>
! <para>There is no documentation for configuration file as for now. Look at
! provided file, there are a lot of comments there.</para>
<para>I am going to make some changes in configuration file before
! 1.0-stable release. I will also provide docs about how to configure lwatch
! in this release.</para>
</refsect1>
***************
*** 108,112 ****
<title>Command line options</title>
<para>
! Type lwatch -h for options and its description.</para>
</refsect1>
--- 109,113 ----
<title>Command line options</title>
<para>
! Type lwatch -h for options and their description.</para>
</refsect1>
***************
*** 120,124 ****
<refsect1>
<title>Running</title>
! <para>Preferred way to run lwatch is reading syslog messages from named fifo or from standard input.</para>
<para>If you use syslog you really want to read messages from named fifo.
To do it put a line:
--- 121,125 ----
<refsect1>
<title>Running</title>
! <para>Preferred way to run lwatch is to read syslog messages from named fifo or from standard input.</para>
<para>If you use syslog you really want to read messages from named fifo.
To do it put a line:
***************
*** 127,131 ****
</literallayout>
in your syslog.conf. Create apropriate fifo and restart syslog, then run
! lwatch. You can also run lwatch before starting syslog, but remember:
<itemizedlist mark="dash" spacing="compact">
<listitem><para>fifo must exists</para></listitem>
--- 128,135 ----
</literallayout>
in your syslog.conf. Create apropriate fifo and restart syslog, then run
! lwatch. You can also run lwatch before starting syslog.</para>
!
! <para>
! Remember:
<itemizedlist mark="dash" spacing="compact">
<listitem><para>fifo must exists</para></listitem>
|
|
From: <ar...@us...> - 2003-02-03 23:37:41
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv15728
Modified Files:
Makefile.in configure configure.ac
Log Message:
- configure.ac: target dist-bzip2, require autoconf 2.57, checking existence
of pcre.h
- doc/Makefile.am: building lwatch.1 from lwatch.sgml
- src/Makefile.am: change variable name (NAGLOWKI -> xh)
- other: automagic rebuild
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.in 3 Feb 2003 00:37:55 -0000 1.9
--- Makefile.in 3 Feb 2003 23:37:35 -0000 1.10
***************
*** 327,332 ****
--- 327,337 ----
$(am__remove_distdir)
+ dist-bzip2: distdir
+ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
dist dist-all: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
***************
*** 466,483 ****
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
clean-generic clean-recursive ctags ctags-recursive dist \
! dist-all dist-gzip distcheck distclean distclean-generic \
! distclean-recursive distclean-tags distcleancheck distdir \
! distuninstallcheck dvi dvi-am dvi-recursive info info-am \
! info-recursive install install-am install-data install-data-am \
! install-data-recursive install-exec install-exec-am \
! install-exec-recursive install-info install-info-am \
! install-info-recursive install-man install-recursive \
! install-strip installcheck installcheck-am installdirs \
! installdirs-am installdirs-recursive maintainer-clean \
! maintainer-clean-generic maintainer-clean-recursive mostlyclean \
! mostlyclean-generic mostlyclean-recursive pdf pdf-am \
! pdf-recursive ps ps-am ps-recursive tags tags-recursive \
! uninstall uninstall-am uninstall-info-am \
! uninstall-info-recursive uninstall-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 471,488 ----
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
clean-generic clean-recursive ctags ctags-recursive dist \
! dist-all dist-bzip2 dist-gzip distcheck distclean \
! distclean-generic distclean-recursive distclean-tags \
! distcleancheck distdir distuninstallcheck dvi dvi-am \
! dvi-recursive info info-am info-recursive install install-am \
! install-data install-data-am install-data-recursive \
! install-exec install-exec-am install-exec-recursive \
! install-info install-info-am install-info-recursive install-man \
! install-recursive install-strip installcheck installcheck-am \
! installdirs installdirs-am installdirs-recursive \
! maintainer-clean maintainer-clean-generic \
! maintainer-clean-recursive mostlyclean mostlyclean-generic \
! mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
! ps-recursive tags tags-recursive uninstall uninstall-am \
! uninstall-info-am uninstall-info-recursive uninstall-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure 3 Feb 2003 00:37:55 -0000 1.7
--- configure 3 Feb 2003 23:37:35 -0000 1.8
***************
*** 3,8 ****
# Generated by GNU Autoconf 2.57 for lwatch 0.1.
#
- # Report bugs to <ar...@he...>.
- #
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
--- 3,6 ----
***************
*** 271,276 ****
PACKAGE_VERSION='0.1'
PACKAGE_STRING='lwatch 0.1'
! PACKAGE_BUGREPORT='ar...@he...'
# Factoring default headers for most tests.
ac_includes_default="\
--- 269,275 ----
PACKAGE_VERSION='0.1'
PACKAGE_STRING='lwatch 0.1'
! PACKAGE_BUGREPORT=''
+ ac_unique_file="src/lwatch.c"
# Factoring default headers for most tests.
ac_includes_default="\
***************
*** 863,867 ****
it to find libraries and programs with nonstandard names/locations.
- Report bugs to <ar...@he...>.
_ACEOF
fi
--- 862,865 ----
***************
*** 1277,1280 ****
--- 1275,1279 ----
+
am__api_version="1.7"
ac_aux_dir=
***************
*** 1668,1672 ****
- #AC_CONFIG_SRCDIR([acolors.c]) #FIXME: a co ja mam z tym zrobiæ?
ac_config_headers="$ac_config_headers src/config.h"
--- 1667,1670 ----
***************
*** 3031,3104 ****
fi
- # Checks for libraries.
-
- echo "$as_me:$LINENO: checking for pcre_version in -lpcre" >&5
- echo $ECHO_N "checking for pcre_version in -lpcre... $ECHO_C" >&6
- if test "${ac_cv_lib_pcre_pcre_version+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpcre $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char pcre_version ();
- int
- main ()
- {
- pcre_version ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (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_lib_pcre_pcre_version=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_pcre_pcre_version=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_version" >&5
- echo "${ECHO_T}$ac_cv_lib_pcre_pcre_version" >&6
- if test $ac_cv_lib_pcre_pcre_version = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPCRE 1
- _ACEOF
-
- LIBS="-lpcre $LIBS"
-
- else
- { { echo "$as_me:$LINENO: error: Error: libpcre not installed. Install first. " >&5
- echo "$as_me: error: Error: libpcre not installed. Install first. " >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
# Checks for header files.
ac_ext=c
--- 3029,3032 ----
***************
*** 3581,3585 ****
! for ac_header in fcntl.h stddef.h stdlib.h string.h sys/param.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--- 3509,3514 ----
!
! for ac_header in fcntl.h stddef.h stdlib.h string.h sys/param.h unistd.h pcre.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
***************
*** 3723,3726 ****
--- 3652,3725 ----
+ # Checks for libraries.
+
+ echo "$as_me:$LINENO: checking for pcre_version in -lpcre" >&5
+ echo $ECHO_N "checking for pcre_version in -lpcre... $ECHO_C" >&6
+ if test "${ac_cv_lib_pcre_pcre_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpcre $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+ char pcre_version ();
+ int
+ main ()
+ {
+ pcre_version ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (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_lib_pcre_pcre_version=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_pcre_pcre_version=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_version" >&5
+ echo "${ECHO_T}$ac_cv_lib_pcre_pcre_version" >&6
+ if test $ac_cv_lib_pcre_pcre_version = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPCRE 1
+ _ACEOF
+
+ LIBS="-lpcre $LIBS"
+
+ else
+ { { echo "$as_me:$LINENO: error: Error: libpcre not installed. Install first. " >&5
+ echo "$as_me: error: Error: libpcre not installed. Install first. " >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
# Checks for typedefs, structures, and compiler characteristics.
echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
***************
*** 4570,4573 ****
--- 4569,4573 ----
+ # Epilog
ac_config_files="$ac_config_files src/Makefile doc/Makefile Makefile"
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure.ac 3 Feb 2003 00:37:55 -0000 1.3
--- configure.ac 3 Feb 2003 23:37:35 -0000 1.4
***************
*** 3,11 ****
# $Source$
! #AC_PREREQ(2.57)
! AC_INIT([lwatch], [0.1], [ar...@he...])
! AM_INIT_AUTOMAKE([lwatch],[0.1])
- #AC_CONFIG_SRCDIR([acolors.c]) #FIXME: a co ja mam z tym zrobiæ?
AM_CONFIG_HEADER(src/config.h)
--- 3,12 ----
# $Source$
! #Initializing
! AC_PREREQ(2.57)
! AC_INIT([lwatch], [0.1])
! AC_CONFIG_SRCDIR(src/lwatch.c)
! AM_INIT_AUTOMAKE([dist-bzip2])
AM_CONFIG_HEADER(src/config.h)
***************
*** 16,25 ****
AM_PROG_LEX
- # Checks for libraries.
- AC_CHECK_LIB([pcre], [pcre_version],, AC_MSG_ERROR([Error: libpcre not installed. Install first. ]))
-
# Checks for header files.
AC_HEADER_STDC
! AC_CHECK_HEADERS([fcntl.h stddef.h stdlib.h string.h sys/param.h unistd.h])
# Checks for typedefs, structures, and compiler characteristics.
--- 17,26 ----
AM_PROG_LEX
# Checks for header files.
AC_HEADER_STDC
! AC_CHECK_HEADERS([fcntl.h stddef.h stdlib.h string.h sys/param.h unistd.h pcre.h])
!
! # Checks for libraries.
! AC_CHECK_LIB([pcre], [pcre_version],, AC_MSG_ERROR([Error: libpcre not installed. Install first. ]))
# Checks for typedefs, structures, and compiler characteristics.
***************
*** 33,36 ****
--- 34,38 ----
AC_CHECK_FUNCS([memset strcasecmp strchr])
+ # Epilog
AC_CONFIG_FILES([src/Makefile doc/Makefile Makefile])
AC_OUTPUT
|
|
From: <ar...@us...> - 2003-02-03 23:37:41
|
Update of /cvsroot/lwatch/files/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15728/src
Modified Files:
Makefile.am Makefile.in config.h.in
Log Message:
- configure.ac: target dist-bzip2, require autoconf 2.57, checking existence
of pcre.h
- doc/Makefile.am: building lwatch.1 from lwatch.sgml
- src/Makefile.am: change variable name (NAGLOWKI -> xh)
- other: automagic rebuild
Index: Makefile.am
===================================================================
RCS file: /cvsroot/lwatch/files/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.am 3 Feb 2003 00:57:40 -0000 1.5
--- Makefile.am 3 Feb 2003 23:37:36 -0000 1.6
***************
*** 1,5 ****
bin_PROGRAMS = lwatch
! NAGLOWKI = acolors.h control.h defaults.h settings.h strpcre.h yparse.h
! lwatch_SOURCES = acolors.c control.c lwatch.c settings.c strpcre.c yparse.l $(NAGLOWKI)
dist_sysconf_DATA = lwatch.conf
CLEANFILES = yparse.c stamp-h.in
--- 1,5 ----
bin_PROGRAMS = lwatch
! xh = acolors.h control.h defaults.h settings.h strpcre.h yparse.h
! lwatch_SOURCES = acolors.c control.c lwatch.c settings.c strpcre.c yparse.l $(xh)
dist_sysconf_DATA = lwatch.conf
CLEANFILES = yparse.c stamp-h.in
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in 3 Feb 2003 00:57:40 -0000 1.7
--- Makefile.in 3 Feb 2003 23:37:36 -0000 1.8
***************
*** 108,113 ****
target_alias = @target_alias@
bin_PROGRAMS = lwatch
! NAGLOWKI = acolors.h control.h defaults.h settings.h strpcre.h yparse.h
! lwatch_SOURCES = acolors.c control.c lwatch.c settings.c strpcre.c yparse.l $(NAGLOWKI)
dist_sysconf_DATA = lwatch.conf
CLEANFILES = yparse.c stamp-h.in
--- 108,113 ----
target_alias = @target_alias@
bin_PROGRAMS = lwatch
! xh = acolors.h control.h defaults.h settings.h strpcre.h yparse.h
! lwatch_SOURCES = acolors.c control.c lwatch.c settings.c strpcre.c yparse.l $(xh)
dist_sysconf_DATA = lwatch.conf
CLEANFILES = yparse.c stamp-h.in
Index: config.h.in
===================================================================
RCS file: /cvsroot/lwatch/files/src/config.h.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config.h.in 3 Feb 2003 00:37:04 -0000 1.5
--- config.h.in 3 Feb 2003 23:37:36 -0000 1.6
***************
*** 23,26 ****
--- 23,29 ----
#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. */
|
|
From: <ar...@us...> - 2003-02-03 23:37:41
|
Update of /cvsroot/lwatch/files/doc In directory sc8-pr-cvs1:/tmp/cvs-serv15728/doc Modified Files: Makefile.am Makefile.in Log Message: - configure.ac: target dist-bzip2, require autoconf 2.57, checking existence of pcre.h - doc/Makefile.am: building lwatch.1 from lwatch.sgml - src/Makefile.am: change variable name (NAGLOWKI -> xh) - other: automagic rebuild Index: Makefile.am =================================================================== RCS file: /cvsroot/lwatch/files/doc/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 3 Feb 2003 00:37:55 -0000 1.6 --- Makefile.am 3 Feb 2003 23:37:36 -0000 1.7 *************** *** 1,12 **** ! ##bin_PROGRAMS = lwatch ! man_MANS = lwatch.1 ! EXTRA_DIST = $(man_MANS) CLEANFILES = lwatch.1 conf.ent - ##if D2M conf.ent: conf.ent.in Makefile ! sed "s#@CONFDIR\@#$(sysconfdir)#" < conf.ent.in > conf.ent lwatch.1: lwatch.sgml conf.ent docbook-to-man lwatch.sgml > lwatch.1 - ##endif --- 1,9 ---- ! dist_man_MANS = lwatch.1 ! EXTRA_DIST = lwatch.sgml conf.ent.in CLEANFILES = lwatch.1 conf.ent conf.ent: conf.ent.in Makefile ! sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent lwatch.1: lwatch.sgml conf.ent docbook-to-man lwatch.sgml > lwatch.1 Index: Makefile.in =================================================================== RCS file: /cvsroot/lwatch/files/doc/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 3 Feb 2003 00:37:55 -0000 1.6 --- Makefile.in 3 Feb 2003 23:37:36 -0000 1.7 *************** *** 107,112 **** sysconfdir = @sysconfdir@ target_alias = @target_alias@ ! man_MANS = lwatch.1 ! EXTRA_DIST = $(man_MANS) CLEANFILES = lwatch.1 conf.ent subdir = doc --- 107,112 ---- sysconfdir = @sysconfdir@ target_alias = @target_alias@ ! dist_man_MANS = lwatch.1 ! EXTRA_DIST = lwatch.sgml conf.ent.in CLEANFILES = lwatch.1 conf.ent subdir = doc *************** *** 117,122 **** NROFF = nroff ! MANS = $(man_MANS) ! DIST_COMMON = Makefile.am Makefile.in all: all-am --- 117,122 ---- NROFF = nroff ! MANS = $(dist_man_MANS) ! DIST_COMMON = $(dist_man_MANS) Makefile.am Makefile.in all: all-am *************** *** 302,306 **** conf.ent: conf.ent.in Makefile ! sed "s#@CONFDIR\@#$(sysconfdir)#" < conf.ent.in > conf.ent lwatch.1: lwatch.sgml conf.ent --- 302,306 ---- conf.ent: conf.ent.in Makefile ! sed "s#@CONFDIR\@#$(sysconfdir)#g" < conf.ent.in > conf.ent lwatch.1: lwatch.sgml conf.ent |
|
From: <ar...@us...> - 2003-02-03 14:07:30
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv17298
Modified Files:
depcomp INSTALL install-sh missing mkinstalldirs
Log Message:
- automake --add-missing --copy --force
Index: depcomp
===================================================================
RCS file: /cvsroot/lwatch/files/depcomp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** depcomp 28 Jan 2003 23:31:01 -0000 1.1
--- depcomp 3 Feb 2003 14:07:25 -0000 1.2
***************
*** 32,36 ****
# `libtool' can also be set to `yes' or `no'.
! depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
--- 32,45 ----
# `libtool' can also be set to `yes' or `no'.
! if test -z "$depfile"; then
! base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
! dir=`echo "$object" | sed 's,/.*$,/,'`
! if test "$dir" = "$object"; then
! dir=
! fi
! # FIXME: should be _deps on DOS.
! depfile="$dir.deps/$base"
! fi
!
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
***************
*** 199,213 ****
tru64)
! # The Tru64 AIX compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
! # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
- tmpdepfile1="$object.d"
- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
if test "$libtool" = yes; then
"$@" -Wc,-MD
else
"$@" -MD
fi
--- 208,227 ----
tru64)
! # The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
! # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in `foo.d' instead, so we check for that too.
# Subdirectories are respected.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1="$dir.libs/$base.lo.d"
+ tmpdepfile2="$dir.libs/$base.d"
"$@" -Wc,-MD
else
+ tmpdepfile1="$dir$base.o.d"
+ tmpdepfile2="$dir$base.d"
"$@" -MD
fi
***************
*** 241,272 ****
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout, regardless of -o,
! # because we must use -o when running libtool.
! test -z "$dashmflag" && dashmflag=-M
! ( IFS=" "
! case " $* " in
! *" --mode=compile "*) # this is libtool, let us make it quiet
! for arg
! do # cycle over the arguments
! case "$arg" in
! "--mode=compile")
! # insert --quiet before "--mode=compile"
! set fnord "$@" --quiet
! shift # fnord
! ;;
! esac
! set fnord "$@" "$arg"
! shift # fnord
! shift # "$arg"
! done
;;
esac
! "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
! ) &
! proc=$!
! "$@"
! stat=$?
! wait "$proc"
! if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
--- 255,292 ----
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout, regardless of -o.
! "$@" || exit $?
!
! # Remove the call to Libtool.
! if test "$libtool" = yes; then
! while test $1 != '--mode=compile'; do
! shift
! done
! shift
! fi
!
! # Remove `-o $object'. We will use -o /dev/null later,
! # however we can't do the remplacement now because
! # `-o $object' might simply not be used
! IFS=" "
! for arg
! do
! case $arg in
! -o)
! shift
! ;;
! $object)
! shift
! ;;
! *)
! set fnord "$@" "$arg"
! shift # fnord
! shift # $arg
;;
esac
! done
!
! test -z "$dashmflag" && dashmflag=-M
! "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
***************
*** 286,319 ****
makedepend)
# X makedepend
! (
! shift
! cleared=no
! for arg in "$@"; do
! case $cleared in no)
! set ""; shift
! cleared=yes
! esac
! case "$arg" in
! -D*|-I*)
! set fnord "$@" "$arg"; shift;;
! -*)
! ;;
! *)
! set fnord "$@" "$arg"; shift;;
! esac
! done
! obj_suffix="`echo $object | sed 's/^.*\././'`"
! touch "$tmpdepfile"
! ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
! ) &
! proc=$!
! "$@"
! stat=$?
! wait "$proc"
! if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
! tail +3 "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
--- 306,334 ----
makedepend)
+ "$@" || exit $?
# X makedepend
! shift
! cleared=no
! for arg in "$@"; do
! case $cleared in
! no)
! set ""; shift
! cleared=yes ;;
! esac
! case "$arg" in
! -D*|-I*)
! set fnord "$@" "$arg"; shift ;;
! -*)
! ;;
! *)
! set fnord "$@" "$arg"; shift ;;
! esac
! done
! obj_suffix="`echo $object | sed 's/^.*\././'`"
! touch "$tmpdepfile"
! ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
! sed '1,2d' "$tmpdepfile" | tr ' ' '
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
***************
*** 325,357 ****
cpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout, regardless of -o,
! # because we must use -o when running libtool.
! ( IFS=" "
! case " $* " in
! *" --mode=compile "*)
! for arg
! do # cycle over the arguments
! case $arg in
! "--mode=compile")
! # insert --quiet before "--mode=compile"
! set fnord "$@" --quiet
! shift # fnord
! ;;
! esac
! set fnord "$@" "$arg"
! shift # fnord
! shift # "$arg"
! done
;;
esac
! "$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
- ) &
- proc=$!
- "$@"
- stat=$?
- wait "$proc"
- if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
--- 340,376 ----
cpp)
# Important note: in order to support this mode, a compiler *must*
! # always write the proprocessed file to stdout.
! "$@" || exit $?
!
! # Remove the call to Libtool.
! if test "$libtool" = yes; then
! while test $1 != '--mode=compile'; do
! shift
! done
! shift
! fi
!
! # Remove `-o $object'.
! IFS=" "
! for arg
! do
! case $arg in
! -o)
! shift
! ;;
! $object)
! shift
! ;;
! *)
! set fnord "$@" "$arg"
! shift # fnord
! shift # $arg
;;
esac
! done
!
! "$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
***************
*** 365,394 ****
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
! ( IFS=" "
! case " $* " in
! *" --mode=compile "*)
! for arg
! do # cycle over the arguments
! case $arg in
! "--mode=compile")
! # insert --quiet before "--mode=compile"
! set fnord "$@" --quiet
! shift # fnord
! ;;
! esac
set fnord "$@" "$arg"
! shift # fnord
! shift # "$arg"
! done
! ;;
esac
! "$@" -E |
! sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
! ) &
! proc=$!
! "$@"
! stat=$?
! wait "$proc"
! if test "$stat" != 0; then exit $stat; fi
rm -f "$depfile"
echo "$object : \\" > "$depfile"
--- 384,406 ----
# always write the proprocessed file to stdout, regardless of -o,
# because we must use -o when running libtool.
! "$@" || exit $?
! IFS=" "
! for arg
! do
! case "$arg" in
! "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
! set fnord "$@"
! shift
! shift
! ;;
! *)
set fnord "$@" "$arg"
! shift
! shift
! ;;
esac
! done
! "$@" -E |
! sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
Index: INSTALL
===================================================================
RCS file: /cvsroot/lwatch/files/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** INSTALL 7 Sep 2002 02:07:18 -0000 1.2
--- INSTALL 3 Feb 2003 14:07:25 -0000 1.3
***************
*** 1,4 ****
! $Id$
! $Source$
Basic Installation
--- 1,7 ----
! Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
! Foundation, Inc.
!
! This file is free documentation; the Free Software Foundation gives
! unlimited permission to copy, distribute and modify it.
Basic Installation
***************
*** 12,29 ****
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
! you can run in the future to recreate the current configuration, a file
! `config.cache' that saves the results of its tests to speed up
! reconfiguring, and a file `config.log' containing compiler output
! (useful mainly for debugging `configure').
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
! be considered for the next release. If at some point `config.cache'
! contains results you don't want to keep, you may remove or edit it.
! The file `configure.in' is used to create `configure' by a program
! called `autoconf'. You only need `configure.in' if you want to change
! it or regenerate `configure' using a newer version of `autoconf'.
The simplest way to compile this package is:
--- 15,39 ----
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
! you can run in the future to recreate the current configuration, and a
! file `config.log' containing compiler output (useful mainly for
! debugging `configure').
!
! It can also use an optional file (typically called `config.cache'
! and enabled with `--cache-file=config.cache' or simply `-C') that saves
! the results of its tests to speed up reconfiguring. (Caching is
! disabled by default to prevent problems with accidental use of stale
! cache files.)
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
! be considered for the next release. If you are using the cache, and at
! some point `config.cache' contains results you don't want to keep, you
! may remove or edit it.
! The file `configure.ac' (or `configure.in') is used to create
! `configure' by a program called `autoconf'. You only need
! `configure.ac' if you want to change it or regenerate `configure' using
! a newer version of `autoconf'.
The simplest way to compile this package is:
***************
*** 59,70 ****
Some systems require unusual options for compilation or linking that
! the `configure' script does not know about. You can give `configure'
! initial values for variables by setting them in the environment. Using
! a Bourne-compatible shell, you can do that on the command line like
! this:
! CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
! Or on systems that have the `env' program, you can do it like this:
! env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
Compiling For Multiple Architectures
--- 69,82 ----
Some systems require unusual options for compilation or linking that
! the `configure' script does not know about. Run `./configure --help'
! for details on some of the pertinent environment variables.
! You can give `configure' initial values for configuration parameters
! by setting variables in the command line or in the environment. Here
! is an example:
!
! ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
!
! *Note Defining Variables::, for more details.
Compiling For Multiple Architectures
***************
*** 79,87 ****
source code in the directory that `configure' is in and in `..'.
! If you have to use a `make' that does not supports the `VPATH'
! variable, you have to compile the package for one architecture at a time
! in the source code directory. After you have installed the package for
! one architecture, use `make distclean' before reconfiguring for another
! architecture.
Installation Names
--- 91,99 ----
source code in the directory that `configure' is in and in `..'.
! If you have to use a `make' that does not support the `VPATH'
! variable, you have to compile the package for one architecture at a
! time in the source code directory. After you have installed the
! package for one architecture, use `make distclean' before reconfiguring
! for another architecture.
Installation Names
***************
*** 126,145 ****
==========================
! There may be some features `configure' can not figure out
! automatically, but needs to determine by the type of host the package
! will run on. Usually `configure' can figure that out, but if it prints
! a message saying it can not guess the host type, give it the
! `--host=TYPE' option. TYPE can either be a short name for the system
! type, such as `sun4', or a canonical name with three fields:
CPU-COMPANY-SYSTEM
! See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
! need to know the host type.
! If you are building compiler tools for cross-compiling, you can also
use the `--target=TYPE' option to select the type of system they will
! produce code for and the `--build=TYPE' option to select the type of
! system on which you are compiling the package.
Sharing Defaults
--- 138,167 ----
==========================
! There may be some features `configure' cannot figure out
! automatically, but needs to determine by the type of machine the package
! will run on. Usually, assuming the package is built to be run on the
! _same_ architectures, `configure' can figure that out, but if it prints
! a message saying it cannot guess the machine type, give it the
! `--build=TYPE' option. TYPE can either be a short name for the system
! type, such as `sun4', or a canonical name which has the form:
!
CPU-COMPANY-SYSTEM
! where SYSTEM can have one of these forms:
!
! OS KERNEL-OS
!
! See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
! need to know the machine type.
! If you are _building_ compiler tools for cross-compiling, you should
use the `--target=TYPE' option to select the type of system they will
! produce code for.
!
! If you want to _use_ a cross compiler, that generates code for a
! platform different from the build platform, you should specify the
! "host" platform (i.e., that on which the generated programs will
! eventually be run) with `--host=TYPE'.
Sharing Defaults
***************
*** 154,171 ****
A warning: not all `configure' scripts look for a site script.
! Operation Controls
==================
`configure' recognizes the following options to control how it
operates.
- `--cache-file=FILE'
- Use and save the results of the tests in FILE instead of
- `./config.cache'. Set FILE to `/dev/null' to disable caching, for
- debugging `configure'.
-
`--help'
Print a summary of the options to `configure', and exit.
`--quiet'
`--silent'
--- 176,217 ----
A warning: not all `configure' scripts look for a site script.
! Defining Variables
==================
+ Variables not defined in a site shell script can be set in the
+ environment passed to `configure'. However, some packages may run
+ configure again during the build, and the customized values of these
+ variables may be lost. In order to avoid this problem, you should set
+ them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+ will cause the specified gcc to be used as the C compiler (unless it is
+ overridden in the site shell script).
+
+ `configure' Invocation
+ ======================
+
`configure' recognizes the following options to control how it
operates.
`--help'
+ `-h'
Print a summary of the options to `configure', and exit.
+ `--version'
+ `-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+ `--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+ `--config-cache'
+ `-C'
+ Alias for `--cache-file=config.cache'.
+
`--quiet'
`--silent'
***************
*** 179,185 ****
`configure' can determine that directory automatically.
! `--version'
! Print the version of Autoconf used to generate the `configure'
! script, and exit.
- `configure' also accepts some other, not widely useful, options.
--- 225,229 ----
`configure' can determine that directory automatically.
! `configure' also accepts some other, not widely useful, options. Run
! `configure --help' for more details.
Index: install-sh
===================================================================
RCS file: /cvsroot/lwatch/files/install-sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install-sh 28 Jan 2003 23:31:01 -0000 1.3
--- install-sh 3 Feb 2003 14:07:25 -0000 1.4
***************
*** 57,61 ****
while [ x"$1" != x ]; do
case $1 in
! -c) instcmd="$cpprog"
shift
continue;;
--- 57,61 ----
while [ x"$1" != x ]; do
case $1 in
! -c) instcmd=$cpprog
shift
continue;;
***************
*** 80,84 ****
continue;;
! -s) stripcmd="$stripprog"
shift
continue;;
--- 80,84 ----
continue;;
! -s) stripcmd=$stripprog
shift
continue;;
***************
*** 107,114 ****
if [ x"$src" = x ]
then
! echo "install: no input file specified"
exit 1
else
! true
fi
--- 107,114 ----
if [ x"$src" = x ]
then
! echo "$0: no input file specified" >&2
exit 1
else
! :
fi
***************
*** 116,146 ****
dst=$src
src=""
!
! if [ -d $dst ]; then
instcmd=:
chmodcmd=""
else
! instcmd=mkdir
fi
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
! # might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
! if [ -f $src -o -d $src ]
then
! true
else
! echo "install: $src does not exist"
exit 1
fi
!
if [ x"$dst" = x ]
then
! echo "install: no destination specified"
exit 1
else
! true
fi
--- 116,146 ----
dst=$src
src=""
!
! if [ -d "$dst" ]; then
instcmd=:
chmodcmd=""
else
! instcmd=$mkdirprog
fi
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
! # might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
! if [ -f "$src" ] || [ -d "$src" ]
then
! :
else
! echo "$0: $src does not exist" >&2
exit 1
fi
!
if [ x"$dst" = x ]
then
! echo "$0: no destination specified" >&2
exit 1
else
! :
fi
***************
*** 148,161 ****
# does not like double slashes in filenames, you may need to add some logic
! if [ -d $dst ]
then
! dst="$dst"/`basename $src`
else
! true
fi
fi
## this sed command emulates the dirname command
! dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
--- 148,161 ----
# does not like double slashes in filenames, you may need to add some logic
! if [ -d "$dst" ]
then
! dst=$dst/`basename "$src"`
else
! :
fi
fi
## this sed command emulates the dirname command
! dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
***************
*** 164,191 ****
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
! defaultIFS='
! '
! IFS="${IFS-${defaultIFS}}"
! oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
! set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
! IFS="${oIFS}"
pathcomp=''
while [ $# -ne 0 ] ; do
! pathcomp="${pathcomp}${1}"
shift
! if [ ! -d "${pathcomp}" ] ;
then
! $mkdirprog "${pathcomp}"
else
! true
fi
! pathcomp="${pathcomp}/"
done
fi
--- 164,191 ----
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
! defaultIFS='
! '
! IFS="${IFS-$defaultIFS}"
! oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
! set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
! IFS=$oIFS
pathcomp=''
while [ $# -ne 0 ] ; do
! pathcomp=$pathcomp$1
shift
! if [ ! -d "$pathcomp" ] ;
then
! $mkdirprog "$pathcomp"
else
! :
fi
! pathcomp=$pathcomp/
done
fi
***************
*** 193,211 ****
if [ x"$dir_arg" != x ]
then
! $doit $instcmd $dst &&
! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
else
# If we're going to rename the final executable, determine the name now.
! if [ x"$transformarg" = x ]
then
! dstfile=`basename $dst`
else
! dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
--- 193,211 ----
if [ x"$dir_arg" != x ]
then
! $doit $instcmd "$dst" &&
! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
else
# If we're going to rename the final executable, determine the name now.
! if [ x"$transformarg" = x ]
then
! dstfile=`basename "$dst"`
else
! dstfile=`basename "$dst" $transformbasename |
sed $transformarg`$transformbasename
fi
***************
*** 213,232 ****
# don't allow the sed command to completely eliminate the filename
! if [ x"$dstfile" = x ]
then
! dstfile=`basename $dst`
else
! true
fi
! # Make a temp file name in the proper directory.
dsttmp=$dstdir/#inst.$$#
! # Move or copy the file name to the temp name
! $doit $instcmd $src $dsttmp &&
! trap "rm -f ${dsttmp}" 0 &&
# and set any options; do chmod last to preserve setuid bits
--- 213,236 ----
# don't allow the sed command to completely eliminate the filename
! if [ x"$dstfile" = x ]
then
! dstfile=`basename "$dst"`
else
! :
fi
! # Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/#inst.$$#
+ rmtmp=$dstdir/#rm.$$#
! # Trap to clean up temp files at exit.
! trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
! trap '(exit $?); exit' 1 2 13 15
! # Move or copy the file name to the temp name
!
! $doit $instcmd "$src" "$dsttmp" &&
# and set any options; do chmod last to preserve setuid bits
***************
*** 236,251 ****
# errors from the above "$doit $instcmd $src $dsttmp" command.
! if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
# Now rename the file to the real destination.
! $doit $rmcmd -f $dstdir/$dstfile &&
! $doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
! exit 0
--- 240,276 ----
# errors from the above "$doit $instcmd $src $dsttmp" command.
! if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
! if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
! if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
! if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
!
! # Now remove or move aside any old file at destination location. We try this
! # two ways since rm can't unlink itself on some systems and the destination
! # file might be busy for other reasons. In this case, the final cleanup
! # might fail but the new file should still install successfully.
!
! {
! if [ -f "$dstdir/$dstfile" ]
! then
! $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
! $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
! {
! echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
! (exit 1); exit
! }
! else
! :
! fi
! } &&
# Now rename the file to the real destination.
! $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
fi &&
+ # The final little trick to "correctly" pass the exit status to the exit trap.
! {
! (exit 0); exit
! }
Index: missing
===================================================================
RCS file: /cvsroot/lwatch/files/missing,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** missing 28 Jan 2003 23:31:01 -0000 1.3
--- missing 3 Feb 2003 14:07:25 -0000 1.4
***************
*** 1,5 ****
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
! # Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pi...@ir...>, 1996.
--- 1,5 ----
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pi...@ir...>, 1996.
***************
*** 79,83 ****
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
! echo "missing 0.3 - GNU automake"
;;
--- 79,83 ----
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
! echo "missing 0.4 - GNU automake"
;;
***************
*** 88,92 ****
;;
! aclocal)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
--- 88,97 ----
;;
! aclocal*)
! if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
! # We have it, but it failed.
! exit 1
! fi
!
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
***************
*** 98,101 ****
--- 103,111 ----
autoconf)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
***************
*** 107,110 ****
--- 117,125 ----
autoheader)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
***************
*** 125,129 ****
;;
! automake)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
--- 140,149 ----
;;
! automake*)
! if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
! # We have it, but it failed.
! exit 1
! fi
!
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
***************
*** 136,139 ****
--- 156,187 ----
;;
+ autom4te)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
+ echo 1>&2 "\
+ WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
bison|yacc)
echo 1>&2 "\
***************
*** 190,193 ****
--- 238,246 ----
help2man)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
***************
*** 241,248 ****
# messages.
if (gnutar --version > /dev/null 2>&1); then
! gnutar ${1+"$@"} && exit 0
fi
if (gtar --version > /dev/null 2>&1); then
! gtar ${1+"$@"} && exit 0
fi
firstarg="$1"
--- 294,301 ----
# messages.
if (gnutar --version > /dev/null 2>&1); then
! gnutar "$@" && exit 0
fi
if (gtar --version > /dev/null 2>&1); then
! gtar "$@" && exit 0
fi
firstarg="$1"
***************
*** 251,255 ****
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
! tar "$firstarg" ${1+"$@"} && exit 0
;;
esac
--- 304,308 ----
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
! tar "$firstarg" "$@" && exit 0
;;
esac
***************
*** 257,261 ****
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
! tar "$firstarg" ${1+"$@"} && exit 0
;;
esac
--- 310,314 ----
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
! tar "$firstarg" "$@" && exit 0
;;
esac
Index: mkinstalldirs
===================================================================
RCS file: /cvsroot/lwatch/files/mkinstalldirs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mkinstalldirs 28 Jan 2003 23:31:01 -0000 1.3
--- mkinstalldirs 3 Feb 2003 14:07:25 -0000 1.4
***************
*** 5,40 ****
# Public domain
- # $Id$
-
errstatus=0
for file
do
! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
! shift
! pathcomp=
! for d
! do
! pathcomp="$pathcomp$d"
! case "$pathcomp" in
! -* ) pathcomp=./$pathcomp ;;
! esac
! if test ! -d "$pathcomp"; then
! echo "mkdir $pathcomp"
! mkdir "$pathcomp" || lasterr=$?
! if test ! -d "$pathcomp"; then
! errstatus=$lasterr
! fi
! fi
! pathcomp="$pathcomp/"
! done
done
exit $errstatus
# mkinstalldirs ends here
--- 5,111 ----
# Public domain
errstatus=0
+ dirmode=""
+
+ usage="\
+ Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+ # process command line arguments
+ while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+ echo "$usage" 1>&2
+ exit 0
+ ;;
+ -m) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+ dirmode=$1
+ shift
+ ;;
+ --) # stop option processing
+ shift
+ break
+ ;;
+ -*) # unknown option
+ echo "$usage" 1>&2
+ exit 1
+ ;;
+ *) # first non-opt arg
+ break
+ ;;
+ esac
+ done
for file
do
! if test -d "$file"; then
! shift
! else
! break
! fi
! done
! case $# in
! 0) exit 0 ;;
! esac
! case $dirmode in
! '')
! if mkdir -p -- . 2>/dev/null; then
! echo "mkdir -p -- $*"
! exec mkdir -p -- "$@"
! fi
! ;;
! *)
! if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
! echo "mkdir -m $dirmode -p -- $*"
! exec mkdir -m "$dirmode" -p -- "$@"
! fi
! ;;
! esac
! for file
! do
! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
! shift
! pathcomp=
! for d
! do
! pathcomp="$pathcomp$d"
! case $pathcomp in
! -*) pathcomp=./$pathcomp ;;
! esac
! if test ! -d "$pathcomp"; then
! echo "mkdir $pathcomp"
!
! mkdir "$pathcomp" || lasterr=$?
!
! if test ! -d "$pathcomp"; then
! errstatus=$lasterr
! else
! if test ! -z "$dirmode"; then
! echo "chmod $dirmode $pathcomp"
! lasterr=""
! chmod "$dirmode" "$pathcomp" || lasterr=$?
!
! if test ! -z "$lasterr"; then
! errstatus=$lasterr
! fi
! fi
! fi
! fi
!
! pathcomp="$pathcomp/"
! done
done
exit $errstatus
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
+ # End:
# mkinstalldirs ends here
|
