[lwatch-cvs] files Makefile.in,1.14,1.15 configure,1.20,1.21 configure.ac,1.17,1.18
Brought to you by:
arturcz
|
From: <ar...@us...> - 2003-03-18 16:06:15
|
Update of /cvsroot/lwatch/files
In directory sc8-pr-cvs1:/tmp/cvs-serv8486
Modified Files:
Makefile.in configure configure.ac
Log Message:
- searching sed in ${PATH} and if found place it into SED variable
- using $(SED) im Makefiles
Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.in 17 Mar 2003 15:30:58 -0000 1.14
--- Makefile.in 18 Mar 2003 16:05:36 -0000 1.15
***************
*** 80,83 ****
--- 80,84 ----
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
Index: configure
===================================================================
RCS file: /cvsroot/lwatch/files/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** configure 18 Mar 2003 14:47:28 -0000 1.20
--- configure 18 Mar 2003 16:05:36 -0000 1.21
***************
*** 1,4 ****
#! /bin/sh
! # From configure.ac Revision: 1.16 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.2.
--- 1,4 ----
#! /bin/sh
! # From configure.ac Revision: 1.17 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for lwatch 0.2.
***************
*** 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 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 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 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=''
***************
*** 1280,1283 ****
--- 1280,1288 ----
+
+ #AC_CANONICAL_BUILD
+ #AC_CANONICAL_HOST
+ #AC_CANONICAL_TARGET
+
am__api_version="1.7"
ac_aux_dir=
***************
*** 1671,1674 ****
--- 1676,1680 ----
+
test x"$prefix" = xNONE && prefix="$ac_default_prefix"
***************
*** 1676,1725 ****
- # 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
-
-
- if test "$dbook2man" = "no"; then
- { echo "$as_me:$LINENO: WARNING: docbook-to-man not found, using lwatch.1.in stub" >&5
- echo "$as_me: WARNING: docbook-to-man not found, using lwatch.1.in stub" >&2;}
- fi
-
# Checks for programs.
ac_ext=c
--- 1682,1685 ----
***************
*** 3080,3083 ****
--- 3040,3133 ----
LEX=${am_missing_run}flex
fi
+ # Extract the first word of "sed", so it can be a program name with args.
+ set dummy sed; 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_SED+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $SED in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_SED="$SED" # 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_SED="$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_SED" && ac_cv_path_SED="no"
+ ;;
+ esac
+ fi
+ SED=$ac_cv_path_SED
+
+ if test -n "$SED"; then
+ echo "$as_me:$LINENO: result: $SED" >&5
+ echo "${ECHO_T}$SED" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ if test "$SED" = "no"; then
+ { { echo "$as_me:$LINENO: error: sed not found" >&5
+ echo "$as_me: error: sed not found" >&2;}
+ { (exit 1); exit 1; }; }
+ 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
+
+ if test "$dbook2man" = "no"; then
+ { echo "$as_me:$LINENO: WARNING: docbook-to-man not found, using lwatch.1.in stub" >&5
+ echo "$as_me: WARNING: docbook-to-man not found, using lwatch.1.in stub" >&2;}
+ fi
# Checks for header files.
***************
*** 5338,5342 ****
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
--- 5388,5391 ----
***************
*** 5359,5362 ****
--- 5408,5413 ----
s,@LEXLIB@,$LEXLIB,;t t
s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
+ s,@SED@,$SED,;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.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** configure.ac 18 Mar 2003 14:47:30 -0000 1.17
--- configure.ac 18 Mar 2003 16:05:40 -0000 1.18
***************
*** 8,12 ****
--- 8,18 ----
AC_REVISION($Revision$)
AC_CONFIG_SRCDIR(src/lwatch.c)
+
+ #AC_CANONICAL_BUILD
+ #AC_CANONICAL_HOST
+ #AC_CANONICAL_TARGET
+
AM_INIT_AUTOMAKE([dist-bzip2])
+
AC_PREFIX_DEFAULT(/usr/local)
test x"$prefix" = xNONE && prefix="$ac_default_prefix"
***************
*** 14,23 ****
AM_CONFIG_HEADER(src/config.h)
- AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
-
- if test "$dbook2man" = "no"; then
- AC_MSG_WARN([docbook-to-man not found, using lwatch.1.in stub])
- fi
-
# Checks for programs.
AC_PROG_CC
--- 20,23 ----
***************
*** 25,28 ****
--- 25,37 ----
AC_PROG_LN_S
AM_PROG_LEX
+ AC_PATH_PROG(SED,[sed],[no])
+ if test "$SED" = "no"; then
+ AC_MSG_ERROR([sed not found])
+ fi
+
+ AC_PATH_PROG(dbook2man,[docbook-to-man],[no])
+ if test "$dbook2man" = "no"; then
+ AC_MSG_WARN([docbook-to-man not found, using lwatch.1.in stub])
+ fi
# Checks for header files.
|