[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: build errors with diffutils from cvs
|
From: |
Paul Eggert |
|
Subject: |
Re: build errors with diffutils from cvs |
|
Date: |
Wed, 04 Apr 2007 15:08:53 -0700 |
|
User-agent: |
Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) |
Alexander Kahl <address@hidden> writes:
> Attached is a patch which fixed the problems for me.
Thanks for mentioning the problem. I installed the following
somewhat-more-elaborate patch instead.
2007-04-04 Paul Eggert <address@hidden>
* bootstrap: Sync from gnulib.
* src/cmp.c: Don't include exit.h; no longer needed.
* src/diff.c: Likewise.
* src/sdiff.c: Likewise.
* src/dir.c: Don't include strcase.h; no longer needed.
* README-alpha: Remove, replacing with:
* README-hacking: New file, taken from coreutils with some changes.
The rename is required by the change to 'bootstrap'.
Index: bootstrap
===================================================================
RCS file: /cvsroot/diffutils/diffutils/bootstrap,v
retrieving revision 1.5
diff -u -p -r1.5 bootstrap
--- bootstrap 5 Sep 2006 22:57:29 -0000 1.5
+++ bootstrap 4 Apr 2007 22:08:11 -0000
@@ -1,8 +1,8 @@
#! /bin/sh
-# Bootstrap this package from CVS.
+# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,13 +29,42 @@ nl='
LC_ALL=C
export LC_ALL
+# Temporary directory names.
+bt='._bootmp'
+bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
+bt2=${bt}2
+
+usage() {
+ echo >&2 "\
+Usage: $0 [OPTION]...
+Bootstrap this package from the checked-out sources.
+
+Options:
+ --gnulib-srcdir=DIRNAME Specify the local directory where gnulib
+ sources reside. Use this if you already
+ have gnulib sources on your machine, and
+ do not want to waste your bandwidth downloading
+ them again.
+ --copy Copy files instead of creating symbolic links.
+ --force Attempt to bootstrap even if the sources seem
+ not to have been checked out.
+ --skip-po Do not download po files.
+ --cvs-user=USERNAME Set the username to use when checking out
+ sources from the gnulib repository.
+
+If the file .bootstrap.conf exists in the current working directory, its
+contents are read as shell variables to configure the bootstrap.
+
+Running without arguments will suffice in most cases.
+"
+}
# Configuration.
# List of gnulib modules needed.
gnulib_modules=
-# Any extra gnulib files needed.
+# Any gnulib files needed that are not in modules.
gnulib_files=
# Translation Project URL, for the registry of all projects
@@ -60,18 +89,20 @@ extract_package_name='
}
'
package=`sed -n "$extract_package_name" configure.ac` || exit
+gnulib_name=lib$package
-# Extra files from gnulib, which are not part of any module yet.
-gnulib_extra_files='
- build-aux/install-sh
- build-aux/missing
- build-aux/mdate-sh
- build-aux/texinfo.tex
- build-aux/depcomp
- build-aux/config.guess
- build-aux/config.sub
+build_aux=build-aux
+# Extra files from gnulib, which override files from other sources.
+gnulib_extra_files="
+ $build_aux/install-sh
+ $build_aux/missing
+ $build_aux/mdate-sh
+ $build_aux/texinfo.tex
+ $build_aux/depcomp
+ $build_aux/config.guess
+ $build_aux/config.sub
doc/INSTALL
-'
+"
# Other locale categories that need message catalogs.
EXTRA_LOCALE_CATEGORIES=
@@ -86,6 +117,13 @@ XGETTEXT_OPTIONS='\\\
# Files we don't want to import.
excluded_files=
+# File that should exist in the top directory of a checked out hierarchy,
+# but not in a distribution tarball.
+checkout_only_file=README-hacking
+
+# Whether to use copies instead of symlinks.
+copy=false
+
# Override the default configuration, if necessary.
test -r bootstrap.conf && . ./bootstrap.conf
@@ -97,7 +135,7 @@ for option
do
case $option in
--help)
- echo "$0: usage: $0 [--gnulib-srcdir=DIR] [--cvs-user=USERNAME]
[--skip-po]"
+ usage
exit;;
--gnulib-srcdir=*)
GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
@@ -105,13 +143,52 @@ do
CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
--skip-po)
SKIP_PO=t;;
+ --force)
+ checkout_only_file=;;
+ --copy)
+ copy=true;;
*)
echo >&2 "$0: $option: unknown option"
exit 1;;
esac
done
-echo "$0: Bootstrapping CVS $package..."
+if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+ echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
+ exit 1
+fi
+
+# If $STR is not already on a line by itself in $FILE, insert it,
+# sorting the new contents of the file and replacing $FILE with the result.
+insert_sorted_if_absent() {
+ file=$1
+ str=$2
+ echo "$str" | sort -u - $file | cmp -s - $file \
+ || echo "$str" | sort -u - $file -o $file \
+ || exit 1
+}
+
+# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
+found_aux_dir=no
+grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
+ >/dev/null && found_aux_dir=yes
+grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
+ >/dev/null && found_aux_dir=yes
+if test $found_aux_dir = no; then
+ echo "$0: expected line not found in configure.ac. Add the following:" >&2
+ echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2.
+fi
+
+# If $build_aux doesn't exist, create it now, otherwise some bits
+# below will malfunction. If creating it, also mark it as ignored.
+if test ! -d $build_aux; then
+ mkdir $build_aux
+ for ig in .cvsignore .gitignore; do
+ test -f $ig && insert_sorted_if_absent $ig $build_aux
+ done
+fi
+
+echo "$0: Bootstrapping from checked-out $package sources..."
cleanup_gnulib() {
status=$?
@@ -137,7 +214,7 @@ case ${GNULIB_SRCDIR--} in
esac
case $CVS_RSH in
- '') export CVS_RSH=ssh;;
+ '') CVS_RSH=ssh; export CVS_RSH;;
esac
trap cleanup_gnulib 1 2 13 15
@@ -205,13 +282,113 @@ case $SKIP_PO in
WGET_COMMAND='';;
esac
- get_translations po $package || exit
+ if test -d po; then
+ get_translations po $package || exit
+ fi
if test -d runtime-po; then
get_translations runtime-po $package-runtime || exit
fi;;
esac
+symlink_to_gnulib()
+{
+ src=$GNULIB_SRCDIR/$1
+ dst=${2-$1}
+
+ test -f "$src" && {
+ if $copy; then
+ {
+ test ! -h "$dst" || {
+ echo "$0: rm -f $dst" &&
+ rm -f "$dst"
+ }
+ } &&
+ test -f "$dst" &&
+ cmp -s "$src" "$dst" || {
+ echo "$0: cp -fp $src $dst" &&
+ cp -fp "$src" "$dst"
+ }
+ else
+ test -h "$dst" &&
+ src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
+ dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
+ test "$src_i" = "$dst_i" || {
+ dot_dots=
+ case $src in
+ /*) ;;
+ *)
+ case /$dst/ in
+ *//* | */../* | */./* | /*/*/*/*/*/)
+ echo >&2 "$0: invalid symlink calculation: $src -> $dst"
+ exit 1;;
+ /*/*/*/*/) dot_dots=../../../;;
+ /*/*/*/) dot_dots=../../;;
+ /*/*/) dot_dots=../;;
+ esac;;
+ esac
+
+ echo "$0: ln -fs $dot_dots$src $dst" &&
+ ln -fs "$dot_dots$src" "$dst"
+ }
+ fi
+ }
+}
+
+cp_mark_as_generated()
+{
+ cp_src=$1
+ cp_dst=$2
+
+ if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
+ symlink_to_gnulib "$cp_dst"
+ else
+ case $cp_dst in
+ *.[ch]) c1='/* '; c2=' */';;
+ *.texi) c1='@c '; c2= ;;
+ *.m4|*/Make*|Make*) c1='# ' ; c2= ;;
+ *) c1= ; c2= ;;
+ esac
+
+ if test -z "$c1"; then
+ cmp -s "$cp_src" "$cp_dst" || {
+ echo "$0: cp -f $cp_src $cp_dst" &&
+ rm -f "$cp_dst" &&
+ sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst"
+ }
+ else
+ # Copy the file first to get proper permissions if it
+ # doesn't already exist. Then overwrite the copy.
+ cp "$cp_src" "$cp_dst-t" &&
+ (
+ echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
+ echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
+ sed "s!$bt_regex/!!g" "$cp_src"
+ ) > $cp_dst-t &&
+ if cmp -s "$cp_dst-t" "$cp_dst"; then
+ rm -f "$cp_dst-t"
+ else
+ echo "$0: cp $cp_src $cp_dst # with edits" &&
+ mv -f "$cp_dst-t" "$cp_dst"
+ fi
+ fi
+ fi
+}
+
+version_controlled_file() {
+ dir=$1
+ file=$2
+ found=no
+ if test -d CVS; then
+ grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
+ grep '^/[^/]*/[0-9]' > /dev/null && found=yes
+ elif test -d .git; then
+ git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+ else
+ echo "$0: no version control for $dir/$file?" >&2
+ fi
+ test $found = yes
+}
slurp() {
for dir in . `(cd $1 && find * -type d -print)`; do
@@ -222,19 +399,22 @@ slurp() {
for excluded_file in $excluded_files; do
test "$dir/$file" = "$excluded_file" && continue 2
done
- test -d $dir || mkdir $dir || exit
if test $file = Makefile.am; then
- copied=$copied${sep}gnulib.mk; sep=$nl
- echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
- sed '/^[^#].*\/intl/s/^/#/' $1/$dir/$file >$dir/gnulib.mk
- elif test -r ${2-no/such/dir}/$dir/$file ||
- grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
- grep -q '^/[^/]*/[0-9]'; then
+ copied=$copied${sep}gnulib.mk; sep=$nl
+ remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
+ sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/gnulib.mk || {
+ echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
+ rm -f $dir/gnulib.mk &&
+ sed "$remove_intl" $1/$dir/$file >$dir/gnulib.mk
+ }
+ elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
+ version_controlled_file $dir $file; then
echo "$0: $dir/$file overrides $1/$dir/$file"
else
copied=$copied$sep$file; sep=$nl
if test $file = gettext.m4; then
echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
+ rm -f $dir/$file
sed '
/^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
AC_DEFUN([AM_INTL_SUBDIR], [
@@ -244,24 +424,27 @@ slurp() {
AC_DEFUN([gl_LOCK_EARLY], [])
' $1/$dir/$file >$dir/$file
else
- cp $1/$dir/$file $dir/$file
+ cp_mark_as_generated $1/$dir/$file $dir/$file
fi
fi || exit
done
- ig=$dir/.cvsignore
- if test -n "$copied" && test -f $ig; then
- echo "$copied" | sort -u - $ig | cmp -s - $ig ||
- echo "$copied" | sort -u - $ig -o $ig || exit
- fi
+ for dot_ig in .cvsignore .gitignore; do
+ ig=$dir/$dot_ig
+ if test -n "$copied" && test -f $ig; then
+ insert_sorted_if_absent $ig "$copied"
+ # If an ignored file name ends with _.h, then also add
+ # the name with just ".h". Many gnulib headers are generated,
+ # e.g., stdint_.h -> stdint.h, dirent_.h ->..., etc.
+ f=`echo "$copied"|sed 's/_\.h$/.h/'`
+ insert_sorted_if_absent $ig "$f"
+ fi
+ done
done
}
# Create boot temporary directories to import from gnulib and gettext.
-
-bt='.#bootmp'
-bt2=${bt}2
rm -fr $bt $bt2 &&
mkdir $bt $bt2 || exit
@@ -270,36 +453,52 @@ mkdir $bt $bt2 || exit
gnulib_tool_options="\
--import\
--no-changelog\
- --aux-dir $bt/build-aux\
+ --aux-dir $bt/$build_aux\
--doc-base $bt/doc\
- --lib lib$package\
+ --lib $gnulib_name\
--m4-base $bt/m4/\
--source-base $bt/lib/\
--tests-base $bt/tests\
+ --local-dir gl\
"
echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
slurp $bt || exit
+for file in $gnulib_files; do
+ symlink_to_gnulib $file || exit
+done
+
# Import from gettext.
+with_gettext=yes
+grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+ with_gettext=no
+
+if test $with_gettext = yes; then
+ echo "$0: (cd $bt2; autopoint) ..."
+ cp configure.ac $bt2 &&
+ (cd $bt2 && autopoint && rm configure.ac) &&
+ slurp $bt2 $bt || exit
-echo "$0: (cd $bt2; autopoint) ..."
-cp configure.ac $bt2 &&
-(cd $bt2 && autopoint && rm configure.ac) &&
-slurp $bt2 $bt || exit
-
-rm -fr $bt $bt2 || exit
+ rm -fr $bt $bt2 || exit
+fi
# Reconfigure, getting other files.
for command in \
+ libtool \
'aclocal --force -I m4' \
'autoconf --force' \
'autoheader --force' \
'automake --add-missing --copy --force-missing';
do
+ if test "$command" = libtool; then
+ grep '^[ ]*AM_PROG_LIBTOOL\>' configure.ac >/dev/null ||
+ continue
+ command='libtoolize -c -f'
+ fi
echo "$0: $command ..."
$command || exit
done
@@ -308,38 +507,44 @@ done
# Get some extra files from gnulib, overriding existing files.
for file in $gnulib_extra_files; do
- src=$GNULIB_SRCDIR/$file
case $file in
- */INSTALL) dest=.;;
- *) dest=$file;;
+ */INSTALL) dst=INSTALL;;
+ *) dst=$file;;
esac
- echo "$0: cp -fp $GNULIB_SRCDIR/$file $dest" &&
- cp -fp $GNULIB_SRCDIR/$file $dest || exit
+ symlink_to_gnulib $file $dst || exit
done
-
-# Create gettext configuration.
-echo "$0: Creating po/Makevars from po/Makevars.template ..."
-sed '
- /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
- /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
- /^XGETTEXT_OPTIONS *=/{
- s/$/ \\/
- a\
- '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
- }
-' po/Makevars.template >po/Makevars
-
-if test -d runtime-po; then
- # Likewise for runtime-po/Makevars, except also change a few other
parameters.
+if test $with_gettext = yes; then
+ # Create gettext configuration.
+ echo "$0: Creating po/Makevars from po/Makevars.template ..."
+ rm -f po/Makevars
sed '
- s/^\(DOMAIN\) *=.*/\1 = '"$package"'-runtime/
- s/^\(subdir\) *=.*/\1 = runtime-po/
- s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = '"$XGETTEXT_OPTIONS_RUNTIME"'/
- ' <po/Makevars >runtime-po/Makevars
+ /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
+ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+ /^XGETTEXT_OPTIONS *=/{
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+ }
+ ' po/Makevars.template >po/Makevars
+
+ if test -d runtime-po; then
+ # Similarly for runtime-po/Makevars, but not quite the same.
+ rm -f runtime-po/Makevars
+ sed '
+ /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
+ /^subdir *=.*/s/=.*/= runtime-po/
+ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+ /^XGETTEXT_OPTIONS *=/{
+ s/$/ \\/
+ a\
+ '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+ }
+ ' <po/Makevars.template >runtime-po/Makevars
- # Copy identical files from po to runtime-po.
- (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
+ # Copy identical files from po to runtime-po.
+ (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
+ fi
fi
echo "$0: done. Now you can run './configure'."
Index: README-alpha
===================================================================
RCS file: README-alpha
diff -N README-alpha
--- README-alpha 5 Jan 2006 07:15:26 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,69 +0,0 @@
-This is a test version of diffutils.
-
-This is a *pre-release* version, and not ready for production use yet.
-Please send comments and problem reports to <address@hidden>.
-
-If you have taken the sources from CVS you will need the following
-packages (or later) to build GNU diffutils. We don't make any extra effort
-to accommodate older versions of these packages, so please make sure
-that you have the latest stable version.
-
-- Automake <http://www.gnu.org/software/automake/>
-- Autoconf <http://www.gnu.org/software/autoconf/>
-- Gettext <http://www.gnu.org/software/gettext/>
-- Gzip <http://www.gnu.org/software/gzip/>
-- M4 <http://www.gnu.org/software/m4/>
-- Wget <http://www.gnu.org/software/wget/>
-
-As of this writing, the latest stable version of Gzip is 1.2.4 but we
-suggest using test version 1.3.5 (or later, if one becomes available).
-
-Valgrind <http://valgrind.org/> is also highly recommended, if
-Valgrind supports your architecture.
-
-Before building the package, run "bootstrap". It obtains various
-additional files from the CVS repository and the Translation Project
-site and prepares the source directory for building.
-
-When run without arguments, bootstrap will try to obtain gnulib and
-files from their corresponding CVS repositories on Savannah. Then, it
-will fetch the po files from the page at Translation Project, and,
-finally, it will start the autoconfiguration process. Simply running
-it without arguments should do in most cases. Several options allow
-to control the behavior of bootstrap:
-
- --gnulib-srcdir=DIRNAME Specify the local directory where gnulib
- sources reside. Use this if you already
- have gnulib sources on your machine, and
- do not want to waste your bandwidth dowloading
- them again.
-
- --cvs-user=USERNAME Set the CVS username to be used when accessing
- the gnulib repository.
-
- --skip-po Do not download po files.
-
-Notice also that when using CVS authentication method "ext", bootstrap
-will set the variable CVS_RSH to "ssh", unless it is already set to
-some other value.
-
-
-
-Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-
-This file is part of GNU diffutils.
-
-GNU diffutils is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU diffutils is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with diffutils; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
Index: README-hacking
===================================================================
RCS file: README-hacking
diff -N README-hacking
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ README-hacking 4 Apr 2007 22:08:11 -0000
@@ -0,0 +1,69 @@
+-*- outline -*-
+
+These notes intend to help people working on the checked-out sources.
+These requirements do not apply when building from a distribution tarball.
+
+* Requirements
+
+We've opted to keep only the highest-level sources in the GIT repository.
+This eases our maintenance burden, (fewer merges etc.), but imposes more
+requirements on anyone wishing to build from the just-checked-out sources.
+For example, you have to use the latest stable versions of the maintainer
+tools we depend upon, including:
+
+- Automake <http://www.gnu.org/software/automake/>
+- Autoconf <http://www.gnu.org/software/autoconf/>
+- Gettext <http://www.gnu.org/software/gettext/>
+- Gzip <http://www.gnu.org/software/gzip/>
+- M4 <http://www.gnu.org/software/m4/>
+- Tar <http://www.gnu.org/software/tar/>
+- Wget <http://www.gnu.org/software/wget/>
+
+Valgrind <http://valgrind.org/> is also highly recommended, if
+Valgrind supports your architecture.
+
+Only building the initial full source tree will be a bit painful.
+Later, a plain `cvs update -dP && make' should be sufficient.
+
+* First checkout
+
+Obviously, if you are reading these notes, you did manage to check out
+this package from CVS. The next step is to get other files needed to
+build, which are extracted from other source packages:
+
+ $ ./bootstrap
+
+And there you are! Just
+
+ $ ./configure
+ $ make
+ $ make check
+
+At this point, there should be no difference between your local copy,
+and the master:
+
+ $ cvs diff -pu
+
+should output no difference.
+
+Enjoy!
+
+-----
+
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software
+Foundation, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.
Index: src/cmp.c
===================================================================
RCS file: /cvsroot/diffutils/diffutils/src/cmp.c,v
retrieving revision 1.45
diff -u -p -r1.45 cmp.c
--- src/cmp.c 9 May 2006 22:57:20 -0000 1.45
+++ src/cmp.c 4 Apr 2007 22:08:11 -0000
@@ -1,7 +1,7 @@
/* cmp - compare two files byte by byte
Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2001,
- 2002, 2004, 2006 Free Software Foundation, Inc.
+ 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
#include <c-stack.h>
#include <cmpbuf.h>
#include <error.h>
-#include <exit.h>
#include <exitfail.h>
#include <file-type.h>
#include <getopt.h>
Index: src/diff.c
===================================================================
RCS file: /cvsroot/diffutils/diffutils/src/diff.c,v
retrieving revision 1.43
diff -u -p -r1.43 diff.c
--- src/diff.c 5 Jan 2006 07:23:55 -0000 1.43
+++ src/diff.c 4 Apr 2007 22:08:11 -0000
@@ -1,7 +1,7 @@
/* diff - compare files line by line
Copyright (C) 1988, 1989, 1992, 1993, 1994, 1996, 1998, 2001, 2002,
- 2004, 2006 Free Software Foundation, Inc.
+ 2004, 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU DIFF.
@@ -27,7 +27,6 @@
#include <dirname.h>
#include <error.h>
#include <exclude.h>
-#include <exit.h>
#include <exitfail.h>
#include <file-type.h>
#include <fnmatch.h>
Index: src/sdiff.c
===================================================================
RCS file: /cvsroot/diffutils/diffutils/src/sdiff.c,v
retrieving revision 1.46
diff -u -p -r1.46 sdiff.c
--- src/sdiff.c 14 Nov 2006 22:53:59 -0000 1.46
+++ src/sdiff.c 4 Apr 2007 22:08:11 -0000
@@ -1,7 +1,7 @@
/* sdiff - side-by-side merge of file differences
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2001, 2002, 2004,
- 2006 Free Software Foundation, Inc.
+ 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU DIFF.
@@ -29,7 +29,6 @@
#include <c-stack.h>
#include <dirname.h>
#include <error.h>
-#include <exit.h>
#include <exitfail.h>
#include <file-type.h>
#include <getopt.h>
Index: src/dir.c
===================================================================
RCS file: /cvsroot/diffutils/diffutils/src/dir.c,v
retrieving revision 1.22
diff -u -p -r1.22 dir.c
--- src/dir.c 5 Sep 2006 22:57:29 -0000 1.22
+++ src/dir.c 4 Apr 2007 22:08:11 -0000
@@ -1,7 +1,7 @@
/* Read, sort and compare two directories. Used for GNU DIFF.
Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1998, 2001, 2002,
- 2004, 2006 Free Software Foundation, Inc.
+ 2004, 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU DIFF.
@@ -24,7 +24,6 @@
#include <error.h>
#include <exclude.h>
#include <setjmp.h>
-#include <strcase.h>
#include <xalloc.h>
/* Read the directory named by DIR and store into DIRDATA a sorted vector