[lwatch-cvs] files Makefile.in,1.9,1.10 configure,1.7,1.8 configure.ac,1.3,1.4
Brought to you by:
arturcz
|
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
|