[lwatch-cvs] files Makefile.am,1.3,1.4 Makefile.in,1.12,1.13 configure,1.11,1.12 configure.ac,1.7,1.
Brought to you by:
arturcz
Menu
▾
▴
[lwatch-cvs] files Makefile.am,1.3,1.4 Makefile.in,1.12,1.13 configure,1.11,1.12 configure.ac,1.7,1.8
|
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 ----
|
