[lwatch-cvs] files Makefile.in,1.11,1.12 configure,1.10,1.11 configure.ac,1.6,1.7

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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