> From: Bruno Haible <br...@clisp.org> > Date: Wed, 26 Jan 2011 18:33:20 +0100 > Cc: c...@stupidchicken.com, > egg...@cs.ucla.edu, > bug-gnulib@gnu.org, > monn...@iro.umontreal.ca, > emacs-de...@gnu.org > > Remember that Eli said that the entire discussion is about renaming files > in the Emacs repository, not in gnulib [1].
That's true. I have no intention to force any undesired changes on gnulib. > 1) About c++defs.h: > > I have proposed in [2] a modification to the Emacs sources that will ensure > that > - No c++defs.h is contained in the build. > - A gnulib-local/modules/c++defs.orig file is contained in the tarball but > not used in the build. According to Eli [3][4] the djtar program can > deal with such a file automatically. IIUC, the file gnulib-local/modules/c++defs.diff is a patch to be applied by gnulib-tool when it reads c++defs from the gnulib directory. But what is the file gnulib-local/build-aux/cxxdefs.h for? Also, the patch in gnulib-local/modules/c++defs.diff would need to be updated from time to time, when c++defs in gnulib changes significantly, is that right? Finally, what is the file c++defs that will be patched by that patch? I see no such file in Emacs at the moment. > 2) About *.in.h include files: > [...] > The simplest way to deal with this is that the script for updating the > Emacs sources from gnulib > 1. runs "gnulib-tool" > 2. looks at list of lib/*.in.h files, > 3. performs some 'mv' commands to rename them, > 4. performs some sed replacements on the generated Makefile.am. That's fine with me, but these Sed replacements could be done by config.bat only for the DOS build. Of course, it's slightly more complicated to do that with DOS shells, but it's certainly doable. > 3) About the collision of gnulib-cache.m4, gnulib-comp.m4, gnulib-common.m4: > [...] > So, I would propose that you change the script from > > gnulib-tool ...<many options> > > to > > if test -f m4/gl-cache.m4; then mv m4/gl-cache.m4 m4/gnulib-cache.m4; done > if test -f m4/gl-comp.m4; then mv m4/gl-comp.m4 m4/gnulib-comp.m4; done > gnulib-tool ...<many options> > mv m4/gnulib-cache.m4 m4/gl-cache.m4 > mv m4/gnulib-comp.m4 m4/gl-comp.m4 That's fine with me. > Eli, do these three proposals solve the issues? I think so. > If not, what's remaining? Assuming this is acceptable to Stefan and Paul, all that's left is for me to understand the details about which I ask above, and then do all these changes. Thanks a lot for taking time to describe these solutions.
