[lwatch-cvs] files ChangeLog,1.6,1.7 Makefile.in,1.17,1.18 configure,1.25,1.26 configure.ac,1.21,1.2
Brought to you by:
arturcz
|
From: <ar...@us...> - 2003-03-24 13:43:58
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv26252
Modified Files:
ChangeLog Makefile.in configure configure.ac
Log Message:
- build-in default input file could be changed during build time with
./configure --enable-input=file
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lwatch/files/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog 21 Mar 2003 15:54:55 -0000 1.6
--- ChangeLog 24 Mar 2003 13:43:19 -0000 1.7
***************
*** 5,8 ****
--- 5,10 ----
support for show_unparsed
bugfix: yes and no was negated
+ some typos corrected
+ build-in default for input file could be replaced during build time
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.in 18 Mar 2003 16:34:33 -0000 1.17
--- Makefile.in 24 Mar 2003 13:43:19 -0000 1.18
***************
*** 60,63 ****
--- 60,64 ----
HAVE_D2M_FALSE = @HAVE_D2M_FALSE@
HAVE_D2M_TRUE = @HAVE_D2M_TRUE@
+ INPUTFILE = @INPUTFILE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** configure 21 Mar 2003 15:35:40 -0000 1.25
--- configure 24 Mar 2003 13:43:19 -0000 1.26
***************
*** 311,315 ****
#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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os 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 SED dbook2man CPP EGREP LIBOBJS HAVE_D2M_TRUE HAVE_D2M_FALSE LTLIBOBJS'
ac_subst_files=''
--- 311,315 ----
#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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os 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 SED dbook2man CPP EGREP LIBOBJS HAVE_D2M_TRUE HAVE_D2M_FALSE INPUTFILE LTLIBOBJS'
ac_subst_files=''
***************
*** 857,860 ****
--- 857,861 ----
--enable-dependency-tracking Do not reject slow dependency extractors
--enable-debug Compile with diagnostic messages
+ --enable-input=file Specify default input file other than /dev/lwatch
Some influential environment variables:
***************
*** 1763,1766 ****
--- 1764,1773 ----
test x"$prefix" = xNONE && prefix="$ac_default_prefix"
+ #if test "$cache_file" = /dev/null; then
+ # cache_file="config.cache"
+ #fi
+ #AC_CACHE_LOAD
+
+
ac_config_headers="$ac_config_headers src/config.h"
***************
*** 4777,4780 ****
--- 4784,4790 ----
+
+
+
# Checks for user options
echo "$as_me:$LINENO: checking for compile with diagnostic messages" >&5
***************
*** 4813,4816 ****
--- 4823,4850 ----
+ echo "$as_me:$LINENO: checking for default input file" >&5
+ echo $ECHO_N "checking for default input file... $ECHO_C" >&6
+ # Check whether --enable-input or --disable-input was given.
+ if test "${enable_input+set}" = set; then
+ enableval="$enable_input"
+
+ else
+ enable_input="yes"
+ fi;
+ if test "$enable_input" = "no"; then
+ enable_input="/dev/lwatch"
+ fi
+ if test "$enable_input" = "yes"; then
+ enable_input="/dev/lwatch"
+ fi
+ echo "$as_me:$LINENO: result: $enable_input" >&5
+ echo "${ECHO_T}$enable_input" >&6;
+ INPUTFILE=$enable_input
+
+ cat >>confdefs.h <<_ACEOF
+ #define INPUTFILE "${INPUTFILE}"
+ _ACEOF
+
+
# Epilog
ac_config_files="$ac_config_files src/Makefile doc/Makefile Makefile"
***************
*** 5518,5521 ****
--- 5552,5556 ----
s,@HAVE_D2M_TRUE@,$HAVE_D2M_TRUE,;t t
s,@HAVE_D2M_FALSE@,$HAVE_D2M_FALSE,;t t
+ s,@INPUTFILE@,$INPUTFILE,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Index: configure.ac
===================================================================
RCS file: /cvsroot/lwatch/files/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** configure.ac 21 Mar 2003 14:27:48 -0000 1.21
--- configure.ac 24 Mar 2003 13:43:20 -0000 1.22
***************
*** 18,21 ****
--- 18,27 ----
test x"$prefix" = xNONE && prefix="$ac_default_prefix"
+ #if test "$cache_file" = /dev/null; then
+ # cache_file="config.cache"
+ #fi
+ #AC_CACHE_LOAD
+
+
AM_CONFIG_HEADER(src/config.h)
***************
*** 66,69 ****
--- 72,78 ----
[Directory where configuration file is placed])
+ AH_TEMPLATE([INPUTFILE],
+ [Default input file])
+
# Checks for user options
AC_MSG_CHECKING(for compile with diagnostic messages)
***************
*** 80,83 ****
--- 89,106 ----
AM_CONDITIONAL(HAVE_D2M, test "$dbook2man" != "no")
+
+ AC_MSG_CHECKING(for default input file)
+ AC_ARG_ENABLE(input,
+ AC_HELP_STRING([--enable-input=file],[Specify default input file other than /dev/lwatch]), ,[enable_input="yes"])
+ if test "$enable_input" = "no"; then
+ enable_input="/dev/lwatch"
+ fi
+ if test "$enable_input" = "yes"; then
+ enable_input="/dev/lwatch"
+ fi
+ AC_MSG_RESULT($enable_input);
+ INPUTFILE=$enable_input
+ AC_SUBST(INPUTFILE)
+ AC_DEFINE_UNQUOTED(INPUTFILE,"${INPUTFILE}")
# Epilog
|