Jim Meyering wrote: > Lennart Borgman wrote: >> I just tried to build on w32 (with the tools I used before) and got >> the error below. Is that expected at the moment? >> >> gcc -I. -c -gdwarf-2 -g3 -DEMACSDEBUG -Ic:/g/include >> -fno-crossjumping -Demacs=1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_N >> TGUI=1 -DUSE_CRT_DLL=1 -DPURESIZE=5000000 -o oo/i386/print.o print.c >> print.c:53:21: ftoastr.h: No such file or directory >> make[2]: *** [oo/i386/print.o] Error 1 >> make[2]: Leaving directory `C:/emacs-lp/bld/emacs/trunk/src' >> make[1]: *** [bootstrap-temacs] Error 2 >> make[1]: Leaving directory `C:/emacs-lp/bld/emacs/trunk/src' >> make: *** [bootstrap-gmake] Error 2 > > ftoastr.h should be in lib/, so the fix is to > do something like adding -I../lib to CFLAGS as used > when running make in src/
Here's an untested patch to do that, assuming that srcdir==builddir. >From 15399c4cf788f89f82197c69884b2e5886c4f9b3 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyer...@redhat.com> Date: Thu, 27 Jan 2011 10:36:57 +0100 Subject: [PATCH] fix w32 compilation failure * makefile.w32-in (LOCAL_FLAGS): Add -I../lib, for gnulib-added headers like ftoastr.h. Reported by Lennart Borgman. --- src/ChangeLog | 6 ++++++ src/makefile.w32-in | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b864b92..b34d6b3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-01-27 Jim Meyering <meyer...@redhat.com> + + fix w32 compilation failure + * makefile.w32-in (LOCAL_FLAGS): Add -I../lib, for gnulib-added + headers like ftoastr.h. Reported by Lennart Borgman. + 2011-01-26 Stefan Monnier <monn...@iro.umontreal.ca> Let the debugger continue to the normal handler (bug#7825). diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 549acf8..8303999 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -28,7 +28,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp # HAVE_CONFIG_H is required by some generic gnu sources stuck into # the emacs source tree. # -LOCAL_FLAGS = -Demacs=1 -DHAVE_CONFIG_H -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS) +LOCAL_FLAGS = -Demacs=1 -DHAVE_CONFIG_H -I../lib -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS) SRC = . EMACS = $(BLD)/emacs.exe -- 1.7.3.5.38.gb312b