nmake build of trunk fails with "DocView requires wxUSE_FILE_HISTORY"

[StepanHrbek]

svn trunk, rev 64295, visual studio (tested 2003,2005,2008,2010)

c:\wxwidgets\build\msw> nmake -f makefile.vc

cl /c /nologo /TC /Fovc_mswud\wxregex_regcomp.obj /MDd /DWIN32 /Zi /Fd..\..\lib\vc_lib\wxregexud.pdb /D_DEBUG /Od /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\include /I..\..\lib\vc_lib\mswud /DWXMSW /D_UNICODE ..\
..\src\regex\regcomp.c
regcomp.c
c:\wxWidgets\include\wx/chkconf.h(1810) : fatal error C1189: #error : "DocView requires wxUSE_FILE_HISTORY"
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\BIN\cl.EXE"' : return code '0x2'
Stop.

My setup.h is identical to setup0.h.
wxUSE_FILE_HISTORY is defined in setup_inc.h, chkconf.h somehow doesn't get it.
Any idea what's wrong, before I dig deeper?

[StepanHrbek]

I see that setup_inc.h is not included. Please someone run update-setup-h and commit, to fix this.

It would save me and possibly others time if setup-inc.h had different name, e.g. setup-inc.txt, and/or had its purpose explained inside.

[vadz]

You need to delete the old setup.h from lib/vc_lib/mswud/wx, it won't be overwritten when you change include/wx/msw/setup.h.

P.S. This has nothing to do with setup_inc.h.

[StepanHrbek]

I'm sorry for bugging, I'm really not sure, but you might be wrong.
Deleting lib/vc_lib made no difference.
Error disappeared after copying wxUSE_FILE_HISTORY from setup-inc.h to setup.h.

[vaclavslavik]

Please read the comment at the top of chkconf.h or BuildSVN.txt for explanation of setup.h handling. You do need to delete or update all your setup.h files (which aren't in SVN!) from setup0.h (which is). There's no bug here and it really has nothing to do with setup-inc.h.

[StepanHrbek]

You are right, I'm stupid, sorry.
I updated setup.h twice before posting, but twice is too few for me, I must have been in wrong working copy :(