emacs/admin/merge-gnulib, branch old-branches/python Emacs is the extensible, customizable, self-documenting real-time display editor. Assume gnulib does largefile. 2012-05-27T09:12:09+00:00 Paul Eggert 2012-05-27T09:12:09+00:00 50c4645e2cc7857c84abeaa3f4787fc7ea34f5a6 Gnulib does the largefile configuration anyway, so when configure.in invokes AC_SYS_LARGEFILE, that bloats 'configure' unnecessarily. * admin/merge-gnulib (GNULIB_MODULES): Add largefile. * configure.in (AC_SYS_LARGEFILE): Remove. * lib/gnulib.mk: Autoupdate. 
Gnulib does the largefile configuration anyway, so when configure.in
invokes AC_SYS_LARGEFILE, that bloats 'configure' unnecessarily.
* admin/merge-gnulib (GNULIB_MODULES): Add largefile.
* configure.in (AC_SYS_LARGEFILE): Remove.
* lib/gnulib.mk: Autoupdate.
Use full name for m4/gnulib-comp.m4. (Bug#11529) 2012-05-21T19:04:11+00:00 Paul Eggert 2012-05-21T19:04:11+00:00 fb77d37e482531da9da27bec77c87a56c6f5ce40 Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions, even though the file's name in gnulib is m4/gnulib-comp.m4. This had a problem when merging from gnulib, as the code temporarily renamed it to the full name, causing problems when interrupted. Now the file has its full name, with the idea that we will find a solution for MS-DOS that does not affect the rest of Emacs. * m4/gnulib-comp.m4: Rename from m4/gl-comp.m4. * admin/merge-gnulib: Leave m4/gnulib-comp.m4's name alone. 
Previously the file was named m4/gl-comp.m4 due to DOS 8+3 restrictions,
even though the file's name in gnulib is m4/gnulib-comp.m4.
This had a problem when merging from gnulib, as the code temporarily
renamed it to the full name, causing problems when interrupted.
Now the file has its full name, with the idea that we will find
a solution for MS-DOS that does not affect the rest of Emacs.
* m4/gnulib-comp.m4: Rename from m4/gl-comp.m4.
* admin/merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
Make merging from gnulib a script, not a makefile action. 2012-05-21T02:33:13+00:00 Paul Eggert 2012-05-21T02:33:13+00:00 9b4ee6166fd8da5f8006a265f775d84e60c15be7 Putting it in a makefile has some problems with reflection, as merging from gnulib updates 'configure', which can update the makefile. Putting it in a standalone script breaks this loop. * Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4) (GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib): Remove, moving the actions to the script admin/merge-gnulib. * admin/merge-gnulib: New script, with actions moved here from ../Makefile.in. 
Putting it in a makefile has some problems with reflection, as
merging from gnulib updates 'configure', which can update the makefile.
Putting it in a standalone script breaks this loop.
* Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
(GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
Remove, moving the actions to the script admin/merge-gnulib.
* admin/merge-gnulib: New script, with actions moved here from
../Makefile.in.