1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-13 16:38:14 +00:00
Commit Graph

71 Commits

Author SHA1 Message Date
Paul Eggert
70d6f2d14f Restore behavior of ‘./autogen.sh autoconf git’
* autogen.sh: Do both autoconf and git setup when invoked
as ‘./autogen.sh autoconf git’.  Avoid unnecessary newline in chatter.
Mention new --no-check option in usage message.  (Bug#25359)
2017-01-12 15:08:15 -08:00
Glenn Morris
3713c7a062 * autogen.sh: Simplify argument parsing. 2017-01-12 14:06:03 -05:00
Glenn Morris
d40073f017 * autogen.sh: Add --no-check option. (Bug#25359) 2017-01-11 15:01:28 -05:00
Paul Eggert
d1d9b37630 Shorten autogen.sh script
* autogen.sh: Use a shorter script, as some 'sed' implementations
mishandle long scripts.
2017-01-05 12:05:27 -08:00
Eli Zaretskii
ade6a024c8 Yet another fix for autogen.sh
* autogen.sh (gnulib.mk): Make the Sed script more portable.

* nt/Makefile.in (${srcdir}/gnulib.mk): Adapt the Sed command to
the changes in autogen.sh.
2017-01-05 21:36:58 +02:00
Eli Zaretskii
99af58d74e * autogen.sh (gnulib.mk): Another attempt to fix macOS build. 2017-01-05 19:48:49 +02:00
Eli Zaretskii
b5f157e935 Unbreak macOS build
* autogen.sh (gnulib.mk): Don't use non-portable extensions of GNU
Sed.
2017-01-05 17:55:43 +02:00
Paul Eggert
44c588a25c Port recent autogen.sh changes to Darwin
Problem reported by Sam Steingold (Bug#25347).
* autogen.sh: Don't assume 'sed -f-' reads a script from stdin, as
POSIX does not require it and it does not work on Darwin.
2017-01-04 00:45:14 -08:00
Eli Zaretskii
10444dcf77 Generate nt/gnulib.mk from lib/gnulib.mk
This was proposed by Paul Eggert <eggert@cs.ucla.edu>,
with the purpose of avoiding manual maintenance of
nt/gnulib.mk.

* nt/gnulib-modules-to-delete.cfg: New file.
* nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0)
(am__v_GEN_1): New variables.
(${srcdir}/gnulib.mk): Rules to generate gnulib.mk from
lib/gnulib.mk and list of modules in gnulib-modules-to-delete.cfg.

* make-dist (nt): Add gnulib-modules-to-delete.cfg to the list of
files to link.
* configure.ac (GNULIB_MK): Compute the value according to $opsys.
* autogen.sh: Create nt/gnulib.mk if it doesn't exist, before
running autoreconf.
* Makefile.in (gnulib_mk): New variable.
($(srcdir)/nt/gnulib.mk): Rule to produce it.
(AUTOMAKE_INPUTS): Use $(gnulib_mk) instead of a literal file
name.
* .gitignore: Add nt/gnulib.mk.

* src/w32.c (acl_errno_valid): Implement it here, as we no longer
build the acl-permissions module from Gnulib.
2017-01-03 17:46:40 +02:00
Paul Eggert
bcf244ef9b Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
2017-01-01 01:10:47 -08:00
Paul Eggert
5badc81c1c Update copyright year to 2017
Run admin/update-copyright.
2016-12-31 19:42:26 -08:00
Paul Eggert
91109821a2 Port autogen.sh to Git 2.4
Problem reported by Michael Brand in:
http://lists.gnu.org/archive/html/emacs-devel/2016-05/msg00367.html
* autogen.sh (git_config): Don't assume that git rev-parse
groks --git-common-dir.
2016-05-14 10:24:41 -07:00
Noam Postavsky
403cc9fad9 Fix autogen.sh for separate worktrees
* autogen.sh: Use the $hooks variable in the $sample_hooks loop, instead
of assuming .git/hooks is a directory.
2016-05-04 21:11:37 -07:00
Paul Eggert
d3edc09c3f Port ‘./autogen.sh git’ to non-clones
Problem reported by Angelo Graziosi in:
http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00341.html
* autogen.sh (do_git): Default to false when the arg is ‘all’ but
there is no ‘.git’.
(git_common_dir, hooks): New vars.
(git_config, tailored_hooks, sample_hooks): Use them.
2016-04-13 18:19:33 -07:00
Paul Eggert
1aebe99145 Do not require that .git be a directory
Problem reportyed by Phillip Lord.
* admin/update_autogen, autogen.sh, build-aux/gitlog-to-emacslog:
* configure.ac, make-dist:
Do not require that .git be a directory, as 'git worktree' makes
it a file and not a directory.
2016-04-13 11:12:39 -07:00
Paul Eggert
181e92c4e0 Improve diff hunk headers when maintaining Emacs
* .gitattributes: Improve diff hunk header support for makefiles,
shell scripts, Ada, C, C++, Objective C, HTML, SHTML, XML, Java,
Perl, PHP, Python, Ruby, and TeX, all of which are used in Emacs
somewhere (sometimes just in test cases).
* autogen.sh: Add regexes for makefiles and shell scripts.
2016-03-13 12:58:30 -07:00
Paul Eggert
f8a8da2535 * autogen.sh: Port to dash (Bug#22556). 2016-02-05 13:45:40 -08:00
Paul Eggert
aca31e3815 autogen.sh now configures git only on request
* autogen.sh (do_autoconf, do_git): New vars.
Support new arguments --help, all, autoconf, git.
By default, just do autoconf-related configuration, not git.
Prefer 'echo' to 'cat <<EOF ...', as this tends to avoid temp files.
If GNU cp is available, use it to backup .git/config before
changing it.  When configuring git, chatter about what is being
done, and configure git to check hashes.  Avoid some duplicate
file name specification when creating git hooks.

* GNUmakefile (ALL_IF_GIT): New macro.
(configure): Use it.
* INSTALL.REPO: Suggest './autogen.sh all'.
2016-02-02 23:14:30 -08:00
Paul Eggert
fe321fdb66 * autogen.sh: Revert all recent changes. 2016-02-02 18:04:32 -08:00
Paul Eggert
c04e91134f Add --git-config option to autogen.sh
* autogen.sh: New options --git-config, --help.
(git_config): New shell var.  Alter function to respect this var.
2016-02-01 23:50:28 -08:00
Paul Eggert
d766ca8ff1 Chatter when autogen.sh changes Git configuration
* autogen.sh (git_config): New function.  Use it instead of ‘git config’.
2016-02-01 08:30:02 -08:00
Paul Eggert
cedd7cad09 autogen.sh now arranges for git to check hashes
Suggested by Karl Fogel in:
http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01802.html
* autogen.sh: Do "git config transfer.fsckObjects true".
2016-01-31 13:43:47 -08:00
Paul Eggert
0e963201d0 Update copyright year to 2016
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
Paul Eggert
4cace70436 Allow autogen even when Git is not installed
* autogen.sh: Test ‘git status’ before trying to use Git.
2015-10-02 12:41:31 -07:00
Paul Eggert
e3a6246eff Improve git diff hunk headers for .el, .texi
Problem reported by Alan Mackenzie in:
http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00826.html
* .gitattributes (*.el, *.texi): New patterns.
* autogen.sh: Configure diff.elisp.xfuncname and
diff.texinfo.xfuncname if using Git.
2015-09-21 11:56:50 -07:00
Paul Eggert
589094a489 Port autogen.sh hook creation to Apple Git
* autogen.sh: Do not assume that the hook samples exist.
This ports to git version 1.9.3 (Apple Git-50).
For some reason Apple decided to populate the git hooks directory
in a different way from the way that standard Git does it.
The downside is that patch applications won't be checked on Apple,
but that's better than autogen.sh failing.
Problem reported by Sam Steingold in:
http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00898.html
2015-01-26 22:35:03 -08:00
Paul Eggert
7e09ef09a4 Update copyright year to 2015
Run admin/update-copyright.
2015-01-01 14:26:41 -08:00
Paul Eggert
6ddd819467 Merge from origin/emacs-24
a5f90a3 * .gitattributes: New file.
5a9710f Make sure tool-bar changes are reflected on display.
93796ba * autogen.sh: Port better to non-GNU 'cp'.
9758516 Fix a typo in a comment in the previous commit.
aa472a3 Fix the pixel coordinates returned by pos-visible-in-window-p.  (Bug#19473)
d261229 * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): New defun. (tramp-test30-special-characters): Use it. (tramp--test-check-files): Filter nil file names out.
9278f05 Omit trailing white space
1c93fd3 Sync with Tramp 2.2.11.
96ebe18 Sync with Tramp 2.2.11.
e792450 Sync with Tramp 2.2.11.
2d17e12 Fix ChangeLog entry.
6444482 Fix auto-revert-tail-mode for remote files
b5c9c13 Spelling fixes
c5504d1 src/w32proc.c (Fw32_get_codepage_charset): Doc fix.  (Bug#19458)

Conflicts:
	ChangeLog
	doc/misc/ChangeLog
	lisp/ChangeLog
	src/ChangeLog
	test/ChangeLog
2015-01-01 10:47:17 -08:00
Paul Eggert
93796baeee * autogen.sh: Port better to non-GNU 'cp'.
Problem reported by Han Boetes.
2014-12-31 07:15:43 -08:00
Paul Eggert
0cce3623b1 Merge branch 'emacs-24'. 2014-11-28 23:07:16 -08:00
Paul Eggert
00981cbdff Add git commit hooks that do some simple checks on commits.
* autogen.sh: Install Git hooks, if using Git.
* build-aux/git-hooks/commit-msg, build-aux/git-hooks/pre-commit:
New files, which are Git hooks that check for portable file names, and
do some simple checks for commit message format.
2014-11-22 16:41:10 -08:00
Eric S. Raymond
cac77f92e3 Backport changes in preparation for git migration from trunk.
admin: Changes in several documents.
 autogen.sh: Neutralize language specific to a repository type.

 doc/misc/efaq-w32.texi: Neutralized language specific to a repository type.

 doc/misc/gnus-coding.txt: Neutralized language specific to a repository type.

 lisp/Makefile.in: Change some production names so they're neutral
 about the repository type.
2014-10-31 11:03:23 +02:00
Eric S. Raymond
5a9bbd17c9 Neutralize language specific to a VCS type. 2014-10-26 11:54:03 -04:00
Eric S. Raymond
2a7753ce3e Neutralize language specific to a repository type. 2014-10-25 14:53:20 -04:00
Paul Eggert
c56327b55d Don't require pkg-config when building from repository.
* INSTALL: Prefer './configure FOO=BAR' to 'FOO=BAR ./configure'.
* INSTALL.REPO: pkg-config is no longer required to build from
the repository.
* autogen.sh: Don't check for pkg-config.
(progs): Remove pkg-config.
(pkg_config_min, AUTORECONF_ENV, env_space, ACLOCAL_PATH):
Remove.  All uses removed.
* m4/pkg.m4: New file, built by admin/merge-pkg-config.
* configure.ac: Remove unnecessary m4_pattern_forbid of ^PKG_ and
an AC_ARG_VAR of PKG_CONFIG_PATH.  pkg.m4 does that for us.
(EMACS_CHECK_MODULES): Remove workaround for old pkg-config bug,
as we use pkg.m4 from a newer pkg-config.
* admin/merge-pkg-config: New script.
* admin/notes/copyright: Update for m4/*.m4, in particular m4/pkg.m4.
* etc/NEWS: Prefer './configure FOO=BAR' to 'FOO=BAR ./configure'.
* etc/PROBLEMS (Build-time-problems): Remove pkg-config problem
that is no longer an issue.
* nt/INSTALL: Remove no-longer-needed notes about pkg-config.
2014-05-16 08:49:13 -07:00
Paul Eggert
0994e45d16 Revert last two changes.
Fixes: debbugs:17438
2014-05-10 19:52:00 -07:00
Paul Eggert
68b067b393 Require pkg-config 0.26 or later in autogen.sh only.
* autogen.sh (pkg_config_min): Make this at least 0.26.
* configure.ac (PKG_PROG_PKG_CONFIG): Revert back to 0.9.0.

Fixes: debbugs:17438
2014-05-10 19:47:57 -07:00
Glenn Morris
98e12950ae * autogen.sh: Check for failing aclocal. 2014-05-07 12:56:34 -04:00
Glenn Morris
e8e2626f06 * autogen.sh: Check any pre-existing ACLOCAL_PATH. 2014-05-05 13:22:32 -04:00
Paul Eggert
4a05c50a46 * autogen.sh: Use ‘"’ to quote a message that often contains ‘'’. 2014-05-04 14:18:30 -07:00
Glenn Morris
c3a435fedd * autogen.sh: If all else fails, try using pkg-config to find pkg.m4.
This is an attempt to get hydra builds working again.
2014-05-03 11:24:10 -07:00
Paul Eggert
541df9f424 Get --enable-gcc-warnings to work after touching configure.ac.
Preserve ACLOCAL_PATH in later builds, so that by default it has
the same value as it did in the first build after initial checkout.
* Makefile.in (ACLOCAL_PATH): New macro.
($(srcdir)/aclocal.m4): Use it.
* configure.ac (ACLOCAL_PATH): AC_SUBST it.
* autogen.sh (env_space): New var.
Tell user what variables, if any, to pass to 'configure'.
2014-05-03 09:27:17 -07:00
Paul Eggert
af3e4d067a Make it easier on maintainers who use their own Automake.
* autogen.sh (ACLOCAL_PATH, AUTORECONF_ENV): New vars.
Set them to avoid problems when maintainers prepend their own
Automake installations to their PATH.  Report an error if pkg.m4
can't be found.
2014-05-03 00:09:16 -07:00
Glenn Morris
b05e08a465 Use pkg-config's pkg.m4
* configure.ac: Use pkg-config's pkg.m4, rather than reinventing it.
Add explicit AC_SUBST's where needed.

* autogen.sh (progs): Add pkg-config.
(pkg_config_min): New variable.

* INSTALL.REPO: Mention pkg-config.

* etc/PROBLEMS: Mention a related issue that can occur with a local automake.
2014-05-02 19:18:11 -04:00
Glenn Morris
5253ea1dcb autogen.sh: minor tweaks
* autogen.sh (get_version): Handle no leading whitespace.
(check_version, main): Handle program names with hyphens.
2014-05-02 13:40:09 -04:00
Paul Eggert
6956b278cd * autogen.sh: Use autoreconf's -f option.
Fixes: debbugs:17258
2014-04-13 22:35:45 -07:00
Glenn Morris
34dc21db6e Replace "Maintainer: FSF" with the emacs-devel mailing address 2014-02-09 17:34:22 -08:00
Glenn Morris
213763c134 Set Maintainer: FSF in some files 2014-01-21 20:54:10 -05:00
Eric S. Raymond
ac4c50ad33 Rename INSTALL.BZR to UNSTALL.REPOm and carry that through in other files. 2014-01-08 18:24:54 -05:00
Paul Eggert
ba3189039a Update copyright year to 2014 by running admin/update-copyright. 2014-01-01 07:43:34 +00:00