From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109306: Use an include file in configure.ac's AH_BOTTOM Date: Tue, 31 Jul 2012 13:33:48 -0700 Organization: UCLA Computer Science Department Message-ID: <5018412C.5020102@cs.ucla.edu> References: <83vch3eu29.fsf@gnu.org> <83sjc7et2f.fsf@gnu.org> <83r4rresf4.fsf@gnu.org> <83obmveo4e.fsf@gnu.org> <8wtxwn3f38.fsf@fencepost.gnu.org> <5atxwnlo5z.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1343766843 26038 80.91.229.3 (31 Jul 2012 20:34:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Jul 2012 20:34:03 +0000 (UTC) Cc: lekktu@gmail.com, Eli Zaretskii , emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jul 31 22:34:03 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SwJ8f-0006rM-Ul for ged-emacs-devel@m.gmane.org; Tue, 31 Jul 2012 22:33:58 +0200 Original-Received: from localhost ([::1]:50567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwJ8f-0007KL-10 for ged-emacs-devel@m.gmane.org; Tue, 31 Jul 2012 16:33:57 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:44368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwJ8c-0007K4-4G for emacs-devel@gnu.org; Tue, 31 Jul 2012 16:33:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwJ8a-0007xp-KR for emacs-devel@gnu.org; Tue, 31 Jul 2012 16:33:53 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:58541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwJ8Y-0007xE-2x; Tue, 31 Jul 2012 16:33:50 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 0E3F939E800A; Tue, 31 Jul 2012 13:33:49 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1nYUz+hUfXIr; Tue, 31 Jul 2012 13:33:47 -0700 (PDT) Original-Received: from [192.168.1.4] (pool-108-23-119-2.lsanca.fios.verizon.net [108.23.119.2]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 83FE439E8008; Tue, 31 Jul 2012 13:33:47 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20120714 Thunderbird/14.0 In-Reply-To: <5atxwnlo5z.fsf@fencepost.gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:152043 Archived-At: On 07/31/2012 12:35 PM, Glenn Morris wrote: > I'd be fine with the absolute minimum change: > > mv s/msdos.h conf_msdos.h It'd be better to move it to the msdos/ directory, since it's MS-DOS specific. Similarly for the other include file. This will help localize the system-specific information. Something like this: === modified file 'admin/MAINTAINERS' --- admin/MAINTAINERS 2012-05-22 16:20:27 +0000 +++ admin/MAINTAINERS 2012-07-31 20:31:34 +0000 @@ -34,7 +34,6 @@ src/msdos.[ch] src/dosfns.[ch] src/w16select.c - src/s/msdos.h lisp/term/internal.el lisp/term/pc-win.el lisp/dos-fns.el === modified file 'lib-src/make-docfile.c' --- lib-src/make-docfile.c 2012-07-10 21:48:34 +0000 +++ lib-src/make-docfile.c 2012-07-31 20:31:34 +0000 @@ -80,7 +80,7 @@ static void write_globals (void); #ifdef MSDOS -/* s/msdos.h defines this as sys_chdir, but we're not linking with the +/* msdos/msdos.h defines this as sys_chdir, but we're not linking with the file where that function is defined. */ #undef chdir #endif === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2012-07-29 15:53:31 +0000 +++ lib-src/makefile.w32-in 2012-07-31 20:31:34 +0000 @@ -360,7 +360,7 @@ NT_INC = $(EMACS_ROOT)/nt/inc GNU_LIB = $(EMACS_ROOT)/lib -MS_W32_H = $(SRC)/s/ms-w32.h \ +MS_W32_H = $(SRC)/../nt/ms-w32.h \ $(NT_INC)/sys/stat.h CONFIG_H = $(SRC)/config.h \ $(MS_W32_H) === modified file 'lib/makefile.w32-in' --- lib/makefile.w32-in 2012-07-29 08:18:29 +0000 +++ lib/makefile.w32-in 2012-07-31 20:31:34 +0000 @@ -71,7 +71,7 @@ C_CTYPE_H = $(GNU_LIB)/c-ctype.h \ $(NT_INC)/stdbool.h -MS_W32_H = $(SRC)/s/ms-w32.h \ +MS_W32_H = $(SRC)/../nt/ms-w32.h \ $(NT_INC)/sys/stat.h CONFIG_H = $(SRC)/config.h \ $(MS_W32_H) === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2012-07-10 01:11:08 +0000 +++ lisp/emacs-lisp/authors.el 2012-07-31 20:31:34 +0000 @@ -578,6 +578,7 @@ ("w32console.c" . "w32term.c") ("unexnt.c" . "unexw32.c") ("s/windowsnt.h" . "s/ms-w32.h") + ("s/ms-w32.h" . "nt/ms-w32.h") ("winnt.el" . "w32-fns.el") ("config.emacs" . "configure") ("configure.in" . "configure.ac") === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-07-28 23:05:32 +0000 +++ msdos/ChangeLog 2012-07-31 20:31:34 +0000 @@ -1,3 +1,7 @@ +2012-07-31 Paul Eggert + + * msdos.h: Rename from ../src/s/msdos.h. All uses changed. + 2012-07-28 Paul Eggert Use Gnulib stdalign module (Bug#9772, Bug#9960). === modified file 'msdos/mainmake.v2' --- msdos/mainmake.v2 2012-06-30 15:32:51 +0000 +++ msdos/mainmake.v2 2012-07-31 20:31:34 +0000 @@ -162,7 +162,7 @@ ../bin/etags --include=../lisp/TAGS \ --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ $(CURDIR)/src/*.c $(CURDIR)/src/*.h \ - $(CURDIR)/src/s/msdos.h + $(CURDIR)/src/../msdos/msdos.h cd .. ./bin/etags --include=src/TAGS === renamed file 'src/s/msdos.h' => 'msdos/msdos.h' === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2012-07-14 10:03:30 +0000 +++ msdos/sed1v2.inp 2012-07-31 20:31:34 +0000 @@ -129,7 +129,7 @@ /^MKDEPDIR *=/s/@MKDEPDIR@// /^version *=/s/@[^@\n]*@// /^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h! -/^S_FILE *=/s!@S_FILE@!$(srcdir)/s/msdos.h! +/^S_FILE *=/s!@S_FILE@!$(srcdir)/../msdos/msdos.h! /^@SET_MAKE@$/s/@SET_MAKE@// /^ [ ]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC! /^ [ ]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp! === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2012-07-28 23:05:32 +0000 +++ msdos/sed2v2.inp 2012-07-31 20:31:34 +0000 @@ -90,7 +90,7 @@ s/^#undef STACK_DIRECTION *$/#define STACK_DIRECTION -1/ s/^#undef EMACS_CONFIGURATION *$/#define EMACS_CONFIGURATION "i386-pc-msdosdjgpp"/ s/^#undef EMACS_CONFIG_OPTIONS *$/#define EMACS_CONFIG_OPTIONS "msdos"/ -s!^#undef config_opsysfile *$!#define config_opsysfile "s/msdos.h"! +s!^#undef config_opsysfile *$!#define config_opsysfile "../msdos/msdos.h"! s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"! s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/ s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/ === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-07-29 16:56:18 +0000 +++ nt/ChangeLog 2012-07-31 20:31:34 +0000 @@ -1,3 +1,7 @@ +2012-07-31 Paul Eggert + + * ms-w32.h: Rename from ../src/s/ms-w32.h. All uses changed. + 2012-07-29 Juanma Barranquero * config.nt: Sync with autogen/config.in. === modified file 'nt/config.nt' --- nt/config.nt 2012-07-29 16:56:18 +0000 +++ nt/config.nt 2012-07-31 20:31:34 +0000 @@ -22,7 +22,7 @@ This file is intentionally kept in sync with autogen/config.in to ease maintenance. Please do not remove non-Windows related stuff unless strictly necessary. Also, before adding anything here - consider whether src/s/ms-w32.h would be a better place; this is + consider whether nt/ms-w32.h would be a better place; this is particularly true for gcc vs. MSVC conditional defines, MinGW or MSVC specific code, and macros not already defined in config.in. */ @@ -1484,7 +1484,7 @@ #undef __restrict_arr /* Define to the used os dependent file. */ -#define config_opsysfile "s/ms-w32.h" +#define config_opsysfile "../nt/ms-w32.h" /* A replacement for va_copy, if needed. */ #define gl_va_copy(a,b) ((a) = (b)) === renamed file 'src/s/ms-w32.h' => 'nt/ms-w32.h' === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2012-07-30 21:20:43 +0000 +++ src/makefile.w32-in 2012-07-31 20:31:34 +0000 @@ -339,7 +339,7 @@ ## ## This works only with GNU Make. -TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/s/ms-w32.h +TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/../nt/ms-w32.h $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE) TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2) @@ -353,7 +353,7 @@ $(OBJ1_c) ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ $(OBJ2_c) \ - $(CURDIR)/*.h $(CURDIR)/s/ms-w32.h + $(CURDIR)/*.h $(CURDIR)/../nt/ms-w32.h TAGS-nmake: echo This target is not supported with NMake @@ -403,7 +403,7 @@ $(GNU_LIB)/verify.h CODING_H = $(SRC)/coding.h \ $(SRC)/composite.h -MS_W32_H = $(SRC)/s/ms-w32.h \ +MS_W32_H = $(SRC)/../nt/ms-w32.h \ $(NT_INC)/sys/stat.h CONFIG_H = $(SRC)/config.h \ $(SRC)/conf_post.h \