summaryrefslogtreecommitdiff
path: root/bootstrap.conf
Commit message (Collapse)AuthorAgeFilesLines
* New option --no-dereference.Bruno Haible2012-01-081-0/+3
| | | | | | | | | | | | | | | * src/diff.h (no_dereference_symlinks): New variable. * src/diff.c: Include xreadlink.h. (longopts): Add --no-dereference option. (main): Accept --no-dereference option. (option_help_msgid): Mention the --no-dereference option. (compare_files): If no_dereference_symlinks is true, use lstat() instead of stat(). Compare symbolic links by comparing their values. * bootstrap.conf (gnulib_modules): Add lstat, stat, xreadlink. * doc/diffutils.texi (Comparing Directories, diff Options): Mention the --no-dereference option. * tests/no-dereference: New file. * tests/Makefile.am (TESTS): Add it.
* maint: update all copyright year number rangesJim Meyering2012-01-011-1/+1
| | | | Run "make update-copyright".
* portability: use SET_BINARY rather than xfreopen (NULL, ...Claudio Bley2011-10-041-0/+1
| | | | | | | * src/diff.c: Include binary-io.h, not xfreopen.h. (main): Use SET_BINARY (...) rather than xfreopen (NULL, X, ...), because the latter doesn't work on MinGW and crashes using MSVC. * src/cmp.c (main): Likewise.
* * bootstrap.conf (gnulib_modules): Remove timegm.Paul Eggert2011-08-131-1/+0
| | | | | This fixes a problem noted by Andreas Schwab in: http://lists.gnu.org/archive/html/bug-diffutils/2011-08/msg00035.html
* build: use largefile module and update to latest gnulibJim Meyering2011-08-101-0/+1
| | | | | | * configure.ac: Remove AC_SYS_LARGEFILE, subsumed by ... * bootstrap.conf (gnulib_modules): ...this. Use largefile module. * gnulib: Update to latest.
* bootstrap: Avoid multithreading.Paul Eggert2011-05-271-2/+4
| | | | | | | | | * bootstrap.conf (gnulib_tool_option_extras): Add "--avoid=localename --avoid=lock", because we don't want to bring in the multithreading code that recent gnulib changes would otherwise bring in. (excluded_files): Remove m4/lock.m4; no longer needed, now that we use --avoid=lock.
* maint: use gnulib's new readme-release moduleJim Meyering2011-05-181-0/+2
| | | | | | | * bootstrap.conf (gnulib_modules): Add readme-release. (bootstrap_epilogue): Add the recommended perl one-liner. * README-release: Remove file; it is now generated from gnulib. * .gitignore: Add it.
* maint: don't use now-removed gnulib "exit" moduleJim Meyering2011-05-181-1/+0
| | | | | * bootstrap.conf (gnulib_modules): Remove "exit" module. It no longer exists.
* maint: update copyright year ranges to include 2011Jim Meyering2011-01-031-1/+1
| | | | Run "make update-copyright", so "make syntax-check" works in 2011.
* bootstrap: adjust to recent gnulib changesPaul Eggert2010-12-161-2/+0
| | | | | | * bootstrap.conf (excluded_files): Do not exclude m4/size_max.m4 and m4/xsize.m4 when using an external gettext, since they are now needed by other gnulib modules.
* build: use gettext-h, not gettextJim Meyering2010-09-041-1/+1
| | | | | | * bootstrap.conf (gnulib_modules): Use gettext-h, not gettext. The latter is overkill for a package that uses AM_GNU_GETTEXT([external]...
* diff -r: avoid printing excess slashes in concatenated file namesJim Meyering2010-08-141-0/+1
| | | | | | | | | | | | * bootstrap.conf (gnulib_modules): Add filenamecat. * src/diff.c: Include "filenamecat.h". (compare_files): Use file_name_concat, rather than dir_file_pathname. * src/util.c (dir_file_pathname): Remove now-unused function. * src/diff.h: Remove its declaration. * tests/excess-slash: New script to test for this. * tests/Makefile.am (TESTS): Add it. Forwarded by Santiago Vila from <bugs.debian.org/586301a>, reported by Jari Aalto.
* build: don't define macros that gnulib providesJim Meyering2010-05-091-0/+2
| | | | | | | | | * bootstrap.conf (gnulib_modules): Add signal, stdint. * lib/cmpbuf.c (SA_RESTART, SA_INTERRUPT): Remove definitions. (SIZE_MAX, PTRDIFF_MAX): Likewise. Include <stdint.h>. * src/system.h (WEXITSTATUS, WIFEXITED): Remove definitions. (SA_RESTART, SA_INTERRUPT): Likewise.
* build: rely on gnulib's sigprocmask moduleJim Meyering2010-05-091-0/+1
| | | | | * src/sdiff.c: Remove #if-!HAVE_SIGPROCMASK-guarded code. * bootstrap.conf (gnulib_modules): Add sigprocmask.
* build: use gnulib's sys_wait moduleJim Meyering2010-05-011-0/+1
| | | | | * bootstrap.conf (gnulib_modules): Use gnulib's sys_wait module, now that we assume its presence.
* build: don't require a specific version of help2manJim Meyering2010-03-171-1/+1
| | | | | * bootstrap.conf (buildreq): Bootstrap can't deal with it, perhaps because the command name contains a digit.
* build: make bootstrap ensure that help2man is availableJim Meyering2010-03-171-0/+1
| | | | * bootstrap.conf (buildreq): Add help2man.
* maint: update all FSF copyright year lists to include 2010Jim Meyering2010-01-011-1/+1
| | | | | | Use this command: git ls-files |grep -vE '^(\..*|COPYING|gnulib)$' |xargs \ env UPDATE_COPYRIGHT_USE_INTERVALS=1 build-aux/update-copyright
* maint: don't pull in gnulib's nanosleep unnecessarilyJim Meyering2009-11-201-1/+0
| | | | | * bootstrap.conf (gnulib_modules): Remove nanosleep. Not needed. Spotted by Eric Blake.
* maint: add gnulib's announce-gen moduleJim Meyering2009-11-201-0/+1
| | | | * bootstrap.conf (gnulib_modules): Add announce-gen
* build: use more gnulib modulesJim Meyering2009-11-201-0/+4
| | | | | * bootstrap.conf (gnulib_modules): Add mktime, nanosleep, strptime and timegm.
* use xfreopen rather than freopenJim Meyering2009-11-201-0/+1
| | | | | | | | | * src/cmp.c: Include "xfreopen.h". Use xfreopen in place of freopen. * src/diff.c Likewise, and... (main): Set exit_failure to EXIT_TROUBLE, rather than to 2. * src/diff3.c: Likewise. * bootstrap.conf (gnulib_modules): Add xfreopen.
* build: enable many warningsJim Meyering2009-11-201-0/+1
| | | | | | * configure.ac: Add support for --enable-gcc-warnings. * bootstrap.conf (gnulib_modules): Add manywarnings. * Makefile.am (AM_CFLAGS): Add $(WARN_CFLAGS) $(WERROR_CFLAGS)
* maint: define/use PROGRAM_NAME and AUTHORS; use propername moduleJim Meyering2009-11-161-0/+1
| | | | | | | | | | * bootstrap.conf (gnulib_modules): Add propername. * src/cmp.c (PROGRAM_NAME, AUTHORS): Define. (main): Use them in use of version_etc. * src/diff.c (PROGRAM_NAME, AUTHORS, main): Likewise. * src/diff3.c (PROGRAM_NAME, AUTHORS, main): Likewise. * src/sdiff.c (PROGRAM_NAME, AUTHORS, main): Likewise. * src/system.h: Include "propername.h".
* build: generate ChangeLog (from git logs) into distribution tarballJim Meyering2009-11-111-0/+1
| | | | | | * Makefile.am (dist-hook, gen-ChangeLog): New rules. (gen_start_date): Define. * bootstrap.conf (gnulib_modules): Add gitlog-to-changelog.
* build: rely on gnulib's progname moduleJim Meyering2009-11-111-0/+1
| | | | | | | | | | | | * bootstrap.conf (gnulib_modules): Add progname. * cfg.mk (local-checks-to-skip): Add sc_program_name. * src/cmp.c: Include progname.h. (program_name): Remove declaration. (main): Call set_program_name. * src/diff.c (main): Likewise. * src/diff3.c (main): Likewise. * src/sdiff.c (main): Likewise. * src/diff.h (program_name): Remove extern declaration.
* build: rely on gnulib's mbrtowc moduleJim Meyering2009-11-111-0/+1
| | | | | | | * bootstrap.conf (gnulib_modules): Add mbrtowc. * src/side.c [!HAVE_MBRTOWC]: Remove now-useless code, since gnulib guarantees working <wchar.h> and mbrtowc. * cfg.mk (local-checks-to-skip): Remove sc_prohibit_HAVE_MBRTOWC.
* build: update build/release infrastructureJim Meyering2009-11-111-20/+100
| | | | | | | | | | | | * bootstrap: Update from gnulib. * bootstrap.conf (gnulib-modules): Add do-release-commit-and-tag, git-version-gen, gnu-make, gnu-web-doc-update, gnumakefile, gnupload, maintainer-makefile, update-copyright. * gnulib-tests/Makefile.am: New file. * cfg.mk: New file. (local-checks-to-skip): List currently-failing tests, so that "syntax-check" passes initially. (manual_title): Define.
* Don't mishandle multibyte characters in side-by-side format.Paul Eggert2009-11-111-1/+1
| | | | | | | | | | | Problem reported by Erik Karlsson in <http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00030.html>. * bootstrap.conf (gnulib_modules): Add wcwidth. * src/side.c: Include <wchar.h>. (print_half_line): Compute number of bytes and print widths of multibyte characters. Inspired by an alternative solution from Bruno Haible in <http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00032.html>.
* Break out diffseq.h into a separate file, so that gettext can usePaul Eggert2009-11-111-1/+1
| | | | | | | | | | | this code. Idea from Bruno Haible. * bootstrap.conf (gnulib_modules): Add diffseq. * src/analyze.c (xvec, yvec, fdiag, bdiag, too_expensive, SNAKE_LIMIT): (struct partition, diag, compareseq): Remove; now in diffseq.h. (ELEMENT, EQUAL, OFFSET, EXTRA_CONTEXT_FIELDS, NOTE_DELETE, NOTE_INSERT): (USE_HEURISTIC): New macros. Include "diffseq.h". (diff_2_files): Rewrite to use new diffseq.h interface.
* * COPYING: New file.Paul Eggert2007-07-191-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* * bootstrap.conf (gnulib_modules): Add inttypes.Paul Eggert2007-06-181-2/+2
|
* Modernize bootstrap procedure to match current gnulib.Paul Eggert2006-09-051-0/+53
* 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.