51 Commits

Author SHA1 Message Date
Jim Meyering
3edb801c06 build: use largefile module and update to latest gnulib
* configure.ac: Remove AC_SYS_LARGEFILE, subsumed by ...
* bootstrap.conf (gnulib_modules): ...this.  Use largefile module.
* gnulib: Update to latest.
2011-08-10 10:21:14 +02:00
Jim Meyering
c8b5b09d13 build: don't require perl when building from a tarball
But do ensure -- in all other circumstances -- that the man/*.1
files are rebuilt whenever the version number changes.
* configure.ac (SRC_VERSION_C): Define.
* man/Makefile.am (dist_man1_MANS): Rename from $(man1_MANS),
so that we distribute those pesky man/*.1 files.
(EXTRA_DIST): Reflect name change.
(MAINTAINERCLEANFILES): Define this, not DISTCLEANFILES,
now that these generated files are distributed.
($(dist_man1_MANS)): Depend on $(SRC_VERSION_C), so we get the
full dependency when not building from a tarball.
2011-06-19 17:15:26 +02:00
Jim Meyering
ce5367b6b3 maint: update copyright year ranges to include 2011
Run "make update-copyright", so "make syntax-check" works in 2011.
2011-01-03 22:13:35 +01:00
Jim Meyering
6a44886e24 maint: update all FSF copyright year lists to include 2010
Use this command:
git ls-files |grep -vE '^(\..*|COPYING|gnulib)$' |xargs \
env UPDATE_COPYRIGHT_USE_INTERVALS=1 build-aux/update-copyright
2010-01-01 16:18:27 +01:00
Jim Meyering
e58efa5bd2 build: enable warnings and -Werror.
* src/Makefile.am (AM_CFLAGS): Enable warnings and -Werror.
Set to this: $(WARN_CFLAGS) $(WERROR_CFLAGS)
* lib/Makefile.am (AM_CFLAGS): Similarly, but use this:
$(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
* configure.ac (GNULIB_WARN_CFLAGS): Don't turn off -Wuninitialized.
2009-11-22 17:16:25 +01:00
Jim Meyering
163f2fa3e8 build: enable many warnings
* configure.ac: Add support for --enable-gcc-warnings.
* bootstrap.conf (gnulib_modules): Add manywarnings.
* Makefile.am (AM_CFLAGS): Add $(WARN_CFLAGS) $(WERROR_CFLAGS)
2009-11-20 10:20:54 +01:00
Jim Meyering
3850429db6 maint: bug-diffutils@gnu.org is the new bug-reporting address
* configure.ac (AC_INIT): Use bug-diffutils@..., not bug-gnu-utils
as the bug-reporting address.
* NEWS (Administrivia): Mention this.
* src/cmp.c (usage): Remove hard-coded address.
Instead, use gnulib's emit_bug_reporting_address function.
* src/diff.c (usage, option_help_msgid): Likewise.
* src/diff3.c (usage): Likewise.
* src/sdiff.c (usage): Likewise.
2009-11-16 22:40:43 +01:00
Jim Meyering
e454c1471a tests: add the first script; hook up gnulib-tests
* configure.ac (AC_CONFIG_FILES): Add tests/Makefile and
gnulib-tests/Makefile.
* tests/help-version: New file, from coreutils.
* tests/test-lib.sh: Likewise.
* tests/Makefile.am: New file, from gzip.
* Makefile.am (SUBDIRS): Add tests and gnulib-tests.
* tests/t-local.sh: New, empty(for now) file.
2009-11-14 11:16:20 +01:00
Jim Meyering
8465a94ddb build: require gettext-0.17
* configure.ac: Require gettext-0.17; it was released two years ago.
2009-11-13 18:09:31 +01:00
Jim Meyering
0fb1003a45 build: correct gettext configure-time support
* configure.ac: Use AM_GNU_GETTEXT([external], [need-ngettext]),
rather than AM_GNU_GETTEXT([external], [need-formatstring-macros]).
Reported by Martin Jacobs in
http://thread.gmane.org/gmane.comp.parsers.bison.bugs/3181
2009-11-13 18:09:31 +01:00
Jim Meyering
9bfafb33a6 admin: update all copyright notices to include the year 2009 2009-11-11 22:18:37 +01:00
Jim Meyering
8075840b39 maint: require newer automake, new non-major version string, dist-xz
* configure.ac: Drop -cvs suffix.  Switch to git-based format.
Distribute xz-compressed tarballs, too.
Require automake-1.11.
Enable automake's --enable-silent-rules option.
2009-11-11 22:18:36 +01:00
Paul Eggert
d4897fbc00 * configure.ac: Invoke gl_USE_SYSTEM_EXTENSIONS after gl_EARLY,
since gnulib now requires this order.
2009-11-11 14:08:06 +01:00
Paul Eggert
43e4846f11 * COPYING: New file.
* AUTHORS: Update from GPLv2 to GPLv3.
* Makefile.am: Likewise.
* NEWS: Likewise.
* README: Likewise.
* README-hacking: Likewise.
* bootstrap: Likewise.
* bootstrap.conf: Likewise.
* configure.ac: Likewise.
* exgettext: Likewise.
* doc/Makefile.am: Likewise.
* lib/Makefile.am: Likewise.
* lib/cmpbuf.c: Likewise.
* lib/cmpbuf.h: Likewise.
* lib/prepargs.c: Likewise.
* m4/vararrays.m4: Likewise.
* man/Makefile.am: Likewise.
* ms/Makefile.am: Likewise.
* ms/README: Likewise.
* ms/config.bat: Likewise.
* ms/config.sed: Likewise.
* ms/config.site: Likewise.
* po/POTFILES.in: Likewise.
* src/Makefile.am: Likewise.
* src/analyze.c: Likewise.
* src/cmp.c: Likewise.
* src/context.c: Likewise.
* src/diff.c: Likewise.
* src/diff.h: Likewise.
* src/diff3.c: Likewise.
* src/dir.c: Likewise.
* src/ed.c: Likewise.
* src/io.c: Likewise.
* src/normal.c: Likewise.
* src/sdiff.c: Likewise.
* src/system.h: Likewise.
* src/util.c: Likewise.
2007-07-19 17:45:29 +00:00
Paul Eggert
1795be71fb Don't assume SIGPIPE exists, and that sigblock and sigsetmask
exist if sigprocmask does not.  Problem reported by Paul Edwards
for MVS 3.8.
* configure.ac (sigblock): Check whether this function is
available, if sigprocmask is not.
* src/sdiff.c (sigs): Omit SIGPIPE if it's not defined.
Put SIGINT last; all uses changed.
(handler_index_of_SIGPIPE): Omit if SIGPIPE is not defined.
(sigblock, sigsetmask) [!HAVE_SIGBLOCK]: New macros.
2006-11-14 20:22:12 +00:00
Paul Eggert
2daf7bfa36 Modernize bootstrap procedure to match current gnulib.
* bootstrap: Sync with coreutils bootstrap, except check that
the directory build-aux exists before trying to copy to it.
* bootstrap.conf: New file.
(gnulib_modules): Add config-h, dup2, extensions, fcntl, fdl,
stat-macros, unistd.
* configure.ac: Invoke gl_EARLY and gl_INIT rather than
GNULIB_AUTOCONF_SNIPPET.
(AC_CONFIG_HEADER): Rename config.h to lib/config.h.
(AC_CHECK_HEADERS_ONCE): Don't check for fcntl.h, locale.h,
sys/file.h, unistd.h.  We now use the fcntl and unistd modules,
and locale.h can be assumed for any C89 compiler.
(DIFFUTILS_PREREQUISITES): Remove.  No longer needed now that
we use the stdint module.
(AC_CHECK_FUNCS_ONCE): Remove dup2, which is no longer needed
now that we use the dup2 module.
(AM_GNU_GETTEXT): Use need-formatstring-macros, and ...
(AM_GNU_GETTEXT_VERSION): specify version 0.15 instead of 0.14.5,
to be consistent with coreutils.
* lib/Makefile.am (noinst_LIBRARIES):
(lib_SOURCES, libdiffutils_a_LIBADD):
(libdiffutils_a_DEPENDENCIES, BUILT_SOURCES, EXTRA_DIST):
(MOSTLYCLEANFILES): Remove; now computed automatically.
(noinst_HEADERS, libdiffutils_a_SOURCES): Just append
our special files now.
* lib/cmpbuf.c: Include config.h unconditionally, since we
no longer define HAVE_CONFIG_H.
* lib/prepargs.c: Likewise.
* src/Makefile.am (LDADD): Use $(LIBINTL), not @LIBINTL@.
(diff_LDADD): Use $(LIB_CLOCK_GETTIME), not @LIB_CLOCK_GETTIME@.
* src/dir.c (dir_read): Use _D_EXACT_NAMLEN, not NAMELEN.
* src/system.h (volatile): Remove, since we assume C89 or better.
Include stat-macros.h.
(S_IRWXU, S_IRWXG, S_IRWXO, S_IRUSR, S_IWUSR):
Remove, since we now use stat-macros.h.
(SEEK_SET, SEEK_CUR): Remove, since we assume C89 or better.
Include unistd.h unconditionally, since we use unistd.
Likewise for fcntl.h.
(dup2): Remove, since we now use dup2.
(O_RDONLY, O_RWDR, O_BINARY): Remove, since we now use
fcntl.
Include dirent.h unconditionally.
(NAMLEN): Remove, replacing with....
(_D_EXACT_NAMLEN): New macro.
Include inttypes.h unconditionally.
(PTRDIFF_MAX, SIZE_MAX, UINTMAX_MAX, strtoumax): Remove, since
we now use inttypes.
Include locale.h unconditionally.
(setlocale): Remove, since we now assume locale.h.
2006-09-05 22:57:29 +00:00
Paul Eggert
f5c7610983 Update FSF address. 2006-01-05 07:23:55 +00:00
Paul Eggert
91b8605708 * src/cmp.c: Don't include <setmode.h>.
(specify_ignore_initial): Reword to avoid gcc -W warnings.
(main): Use freopen instead of setmode, since freopen is in POSIX.
* src/context.c: Revert most 2004-09-01 changes.  Then:
(TIMESPEC_NS): Remove.  All uses replaced by
get_stat_mtime_ns.
Include stat-time.h, strftime.h.
(nstrtime): Remove decl.
* src/diff.c: Revert most 2004-09-01 changes.  Then:
Don't include <posixver.h>, <quotesys.h>, <setmode.h>.
Include <sh-quote.h>, <stat-time.h>, <timespec.h>.
All uses of quotesys replaced by sh-quote.
(main, compare_files):
Use freopen instead of setmode, since freopen is in POSIX.
(main): Don't complain about "diff -NUM'.
(main, set_mtime_to_now):
Adjust to stat-time.h macros when accessing nanoseconds.
* src/diff3.c: Include sh-quote.h rather than quotesys.  All uses
changed.
* src/dir.c (dir_read): excluded_filename renamed to
excluded_file_name.
* src/io.c: Don't include <setmode.h>.
(sip, read_files): Remove binary file stuff, leaving a FIXME behind.
A DOS expert needs to look at this.
* src/diff.c: Include sh-quote.h rather than quotesys.h.
All uses changed.
* src/system.h: Include verify.h.
(verify): Remove.  All uses changed to verify.h version.
Include <intprops.h>.
(TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM): Remove.  Now uses
intprops.h versions.
(O_BINARY): New defns, taken from coreutils.
* src/util.c: Include sh-quote.h rather than quotesys.h.
All uses changed.
2006-01-05 07:08:23 +00:00
Paul Eggert
3b86367275 Add AC_C_INLINE. 2004-09-01 14:37:55 +00:00
Paul Eggert
a76094697e (AM_GNU_GETTEXT_VERSION): Add.
(XGETTEXT): Restore from pre-2004-04-12 version.  This fixes
a bug that lost many msgids in doc/diffutils.pot.
(AC_INIT): Version 2.8.7.
2004-04-13 06:55:43 +00:00
Paul Eggert
fefbcf76e6 (AC_CONFIG_COMMANDS): Remove. 2004-04-12 23:07:15 +00:00
Paul Eggert
a74be8d413 * configure.ac: Quote various arguments better.
(AC_CONFIG_MACRO_DIR): Add call, specifying "m4".
(AC_CONFIG_HEADER): Replaces AM_CONFIG_HEADER.
(gl_USE_SYSTEM_EXTENSIONS): Replaces AC_GNU_SOURCE.
(AC_ISC_POSIX): Remove; nobody ports to ancient ISC any more.
(AC_PROG_CPP, AC_PROG_INSTALL, AC_C_INLINE,
AC_HEADER_STDBOOL, AC_HEADER_STDC, AM_GNU_GETTEXT, XGETTEXT,
AC_HEADER_STAT, AC_FUNC_VPRINTF, jm_FUNC_GLIBC_UNLOCKED_IO,
jm_FUNC_GNU_STRFTIME, jm_FUNC_MALLOC, jm_FUNC_REALLOC,
jm_PREREQ_C_STACK, jm_PREREQ_ERROR, jm_PREREQ_HARD_LOCALE,
jm_PREREQ_QUOTEARG, jm_PREREQ_REGEX, AC_FUNC_FNMATCH_GNU, jm_AC_DOS):
Remove; not needed here, as our files don't use them directly
or we rely on gnulib modules.
(AC_C_CONST): Remove; we assume C89 now.
(AC_CHECK_HEADERS): Remove libintl.h, limits.h, stdlib.h, string.h,
time.h.
(AC_CHECK_TYPE): Remove ptrdiff_t, ssize_t.
(AC_CHECK_FUNCS): Remove diraccess, strchr, strerror, tmpnam).
(AC_REPLACE_FUNCS): Remove memchr, mkstemp, strcasecmp.
(GNULIB_AUTOCONF_SNIPPET): Add call.  This replaces much of
the above.
(AC_CONFIG_FILES): Remove lib/posix/Makefile.
2004-04-12 07:44:35 +00:00
Paul Eggert
6d38b808b9 (AC_INIT): Version 2.8.4. 2002-06-28 07:00:15 +00:00
Paul Eggert
588fadc48e (AC_INIT): Version 2.8.3. 2002-06-17 05:52:49 +00:00
Paul Eggert
229fb65871 (AC_INIT): Version 2.8.2.
(AC_GNU_SOURCE): Move up, so that it affects later compilations properly.
(DEFAULT_DIFF_PROGRAM, AC_TYPE_SIGNAL): Remove.
(jm_AC_TYPE_INTMAX_T): Add.
(AC_FUNC_FNMATCH_GNU): Use this, instead of AC_FUNC_FNMATCH.
(AC_CONFIG_LINKS): regex.hin renamed from regex_.h.
2002-06-11 05:53:54 +00:00
Paul Eggert
23447f11cd (AC_INIT): Version 2.8.1.
(AC_HEADER_STDBOOL): Add.
(AC_CHECK_HEADERS): Remove stdbool.h.
2002-04-05 20:37:31 +00:00
Paul Eggert
a888728c15 (AC_INIT): Version 2.8.
(AC_PREREQ): 2.53.
2002-03-24 07:48:39 +00:00
Paul Eggert
fa03d1fdfb (AC_INIT): Version 2.7.10.
(jm_PREREQ_HARD_LOCALE): Add.
2002-03-12 06:50:10 +00:00
Paul Eggert
2839f50782 Do not distribute shar file. 2002-03-11 08:37:01 +00:00
Paul Eggert
1ada67d90b (AC_INIT): Change package name from diff to diffutils. Bump version
to 2.7.9.
(AM_INIT_AUTOMAKE): Use new form, with options gnits dist-shar,
rather than old from that duplicated AC_INIT.
(AM_MISSING_PROG): Add help2man.
(REGEX_MALLOC): Define.
(AC_CONFIG_FILES): Add man/Makefile.
2002-03-11 07:09:22 +00:00
Paul Eggert
2fb91b7373 (AC_INIT, AM_INIT_AUTOMAKE): Version 2.7.8
(AC__GNU_SOURCE): Add this, replacing AH_VERBATIM of _GNU_SOURCE.
(AM_GNU_GETTEXT): Add external arg, from gettext 0.11.
(tempname): Use AC_LIBOBJS, not LIBOBJS=, as now required by autoconf.
(jm_PREREQ_C_STACK): Add.
(AC_CONFIG_FILES): Remove intl/Makefile.
2002-02-28 06:32:34 +00:00
Paul Eggert
2d27ca42cd (AC_INIT, AM_INIT_AUTOMAKE): Version 2.7.7.
(AC_INIT): Use new 3-arg form.
(AC_CONFIG_SRCDIR): Specify src/diff.c here, not in AC_INIT.
(ALL_LINGUAS): Remove: now in po/LINGUAS as per Gettext 0.11.
(AC_CONFIG_AUX_DIR): New macro invocation.
2002-01-24 20:16:38 +00:00
Paul Eggert
ed5c8a4d3f (ALL_LINGUAS): Add tr. 2001-12-24 00:03:09 +00:00
Paul Eggert
380d97d7b9 (AM_INIT_AUTOMAKE): Version 2.7.5.
(PR_PROGRAM): Use AC_DEFINE_UNQUOTED, so that $PR_PROGRAM is expanded by sh.
(ptrdiff_t, ssize_t): Use AC_CHECK_TYPE with a default of int,
not AC_CHECK_TYPES.
(jm_AC_DOS, AC_FUNC_SETMODE_DOS): New macros.
(AC_CONFIG_FILES): Add ms/Makefile.
2001-12-11 08:07:59 +00:00
Paul Eggert
d7f6b143d9 (AM_INIT_AUTOMAKE): version 2.7.4.
(DEFAULT_DIFF_PROGRAM): Define to "diff", not "$bindir/diff"
(which didn't work anyway).
(AC_CHECK_MEMBERS): Add struct stat.st_blksize, struct stat.st_rdev.
(AC_STRUCT_ST_BLKSIZE, AC_STRUCT_ST_RDEV): Remove; obsolescent.
(AC_FUNC_FORK): Use this, instead of obsolescent AC_FUNC_VFORK.
(AC_CONFIG_FILES, AC_CONFIG_COMMANDS): Add.
(AC_OUTPUT): Remove args; they were obsolescent.
2001-12-03 13:39:35 +00:00
Paul Eggert
23689a884b Don't set LIB_CLOCK_GETTIME to 'none required'; set it to
the empty string instead.
2001-11-25 07:48:26 +00:00
Paul Eggert
258ce5d07b (__EXTENSIONS__): New define, for the unlocked macros. 2001-11-25 07:25:09 +00:00
Paul Eggert
49e3b25b41 (AC_CHECK_FUNCS): Add gettimeofday, clock_gettime.
(LIB_CLOCK_GETTIME): New subst.
2001-11-25 00:22:19 +00:00
Paul Eggert
abb43c1f76 (AC_INIT): Use src/diff.c, not diff.h, as the source files got removed.
(AM_CONFIG_HEADER): Switch from AC_CONFIG_HEADER.
(AC_ARG_PROGRAM, AC_MINIX): Remove.

(AC_PREREQ, AM_INIT_AUTOMAKE, ALL_LINGUAS, AC_PROG_AWK,
AM_PROG_CC_STDC, AC_PROG_RANLIB, AC_C_INLINE, AC_C_VARARRAYS,
DEFAULT_DIFF_PROGRAM, DEFAULT_EDITOR_PROGRAM, AC_STRUCT_ST_MTIM_NSEC): Add.

(PR_PROGRAM): AC_DEFINE.

(AC_SYS_LARGEFILE): Use instead of our homebrew version.

(_GNU_SOURCE): Define if not defined.

(AC_CHECK_HEADERS): Add stdbool.h, unistd.h.
(AC_CHECK_TYPES): Add ptrdiff_t, uintmax_t.
(AM_GNU_GETTEXT, XGETTEXT): Add.

(WITH_MVFS_STAT_BUG, WITH_NFS_STAT_BUG): Remove.
(HAVE_MEMCHR): Remove.
(AC_CHECK_FUNCS): Add diraccess.
(AC_REPLACE_FUNCS): Add memchr, waitpid.
(jm_FUNC_GLIBC_UNLOCKED_IO, jm_FUNC_GNU_STRFTIME, jm_FUNC_MALLOC,
 jm_FUNC_REALLOC, jm_PREREQ_ERROR, jm_PREREQ_QUOTEARG, jm_PREREQ_REGEX,
 jm_PREREQ_TEMPNAME, jm_AC_PREREQ_XSTRTOUMAX, AC_FUNC_FNMATCH): Add.
(fnmatch.h, regex.h): Do not create these files unless we're using
our own fnmatch and regex.
(AC_OUTPUT): Add doc/Makefile, intl/Makefile, lib/Makefile, lib/posix/Makefile,
m4/Makefile, po/Makefile.in, src/Makefile.
2001-11-23 07:46:59 +00:00
Paul Eggert
19db0feae5 (AC_PATH_PROG): Add PR_PROGRAM.
If available, prefer support for large files unless the user specified
one of the CPPFLAGS, LDFLAGS, or LIBS variables.
(AC_STRUCT_ST_RDEV): Add.
(HAVE_ST_FSTYPE_STRING): Add.
(--with-mvfs-stat-bug, --with-nfs-stat-bug): New options.
(HAVE_MEMCHR): New macro.
(AC_CHECK_FUNCS): Add sicprocmask.
1998-09-14 06:13:10 +00:00
Paul Eggert
a6bbb288b2 (AC_CHECK_HEADERS): Add libintl.h, locale.h.
(AC_CHECK_LIB): Check for -lintl.
1994-11-14 05:10:56 +00:00
Paul Eggert
a2290f8c7f (AC_HEADER_SYS_WAIT): Add.
(AC_CHECK_HEADERS): Remove sys/wait.h.
(AC_CHECK_FUNCS): Add tmpnam.
1994-10-01 05:14:15 +00:00
Paul Eggert
7e3fa69d92 (AC_ARG_PROGRAM): Added.
(AC_OUTPUT): Add [date > stamp-h].
1994-09-22 16:47:00 +00:00
Paul Eggert
262be8ba54 (AC_FUNC_MEMCHR): Remove. Autoconf didn't adopt this, since we need not
worry about an old experimental library where memchr didn't work.
(AC_FUNC_MEMCMP): Not needed, since we only test for equality.
(AC_REPLACE_FUNCS): Add test for memchr.
(AC_CHECK_FUNCS): Check for memchr, not memcpy, since it'll be cached.
(AC_CHECK_HEADERS): Add string.h; regex.c uses on some old hosts.
1994-09-13 18:46:43 +00:00
Paul Eggert
3fd81d5f8c Revamp for Autoconf 2. 1994-09-08 07:23:11 +00:00
Paul Eggert
78d1350a8f Switch to new autoconf naming convention. Add test for sys/file.h. 1994-09-03 16:12:53 +00:00
Paul Eggert
c9673423c1 (AC_HAVE_HEADERS): Add unistd.h; remove AC_UNISTD_H. 1993-11-10 08:28:27 +00:00
Paul Eggert
36af5432bf (AC_STAT_MACROS_BROKEN): Add. 1993-09-18 01:33:07 +00:00
Paul Eggert
a2b82541fe Configure HAVE_LIMITS_H, HAVE_STDLIB_H. 1993-09-13 14:22:57 +00:00
Paul Eggert
42326d2647 Configure HAVE_SIGACTION, RETSIGTYPE, HAVE_VPRINTF.
Configure into config.h.
1993-08-27 17:30:26 +00:00