From: Enrico Scholz Date: Mon, 3 Nov 2003 23:11:11 +0000 (+0000) Subject: merged from HEAD X-Git-Tag: version_0_24~5 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2d30e7d2330a8e5c7466ab836804e64d5dcfca2;p=util-vserver.git merged from HEAD git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/branches/SYSCALL_SWITCH@359 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/m4/changelog.am b/util-vserver/m4/changelog.am index b35ee08..9afdf54 100644 --- a/util-vserver/m4/changelog.am +++ b/util-vserver/m4/changelog.am @@ -19,9 +19,18 @@ ChangeLog.sed: test "$(srcdir)" != "." +if HAVE_CVS2CL +ChangeLog: Makefile + if test "$(srcdir)" = "." -a -d CVS; then \ + $(CVS2CL) $(CVS2CL_ALLFLAGS) -f $@; \ + fi +else +if HAVE_RCS2LOG ChangeLog: ChangeLog.sed Makefile if test "$(srcdir)" = "." -a -d CVS; then \ - rcs2log -l 0 -c /dev/stdout | sed -f $< >$@; \ + $(RCS2LOG) -l 0 -c /dev/stdout | sed -f $< >$@; \ fi +endif +endif .PHONY: ChangeLog diff --git a/util-vserver/m4/ensc_changelog.m4 b/util-vserver/m4/ensc_changelog.m4 new file mode 100644 index 0000000..6944781 --- /dev/null +++ b/util-vserver/m4/ensc_changelog.m4 @@ -0,0 +1,31 @@ +dnl $Id$ + +dnl Copyright (C) 2002 Enrico Scholz +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; version 2 of the License. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +dnl Usage: ENSC_CHANGELOG() + +AC_DEFUN([ENSC_CHANGELOG], +[ + if test x"$1" != x; then + AC_SUBST(CVS2CL_TAG, ['-F $1']) + fi + + AC_CHECK_PROGS(CVS2CL, [cvs2cl]) + AM_CONDITIONAL(HAVE_CVS2CL, [test x"$CVS2CL" != x]) + + AC_CHECK_PROGS(RCS2LOG, [rcs2log]) + AM_CONDITIONAL(HAVE_RCS2LOG, [test x"$RCS2LOG" != x]) +])