>>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:

Angus> Jean-Marc Lasgouttes wrote: Yes, but why? What is in config.h
Angus> that is making the difference?
>>  I have to admit that I have no idea. My reasoning is:
>> 
>> 1/ it fixed one case 2/ it is good to do it anyway
>> 
>> but I cannot come up with anything more useful, sorry.

Angus> Ok. However, the undefined boost symbols like
Angus> __ZN5boost7signals9trackableD2Ev are in the generated boost
Angus> library files. I believe that Lars added some strange magic in
Angus> LyX 1.4 to ensure that our config.h is visible to these files
Angus> when they are compiled. I also believe that this same magic
Angus> isn't present in LyX 1.3.

Indeed:

fantomas[ssh]: grep -r "<config.h>" 1.3.x/boost/
fantomas[ssh]: grep -r "<config.h>" lyx-devel/boost/
lyx-devel/boost/libs/regex/src/Makefile.in:     
-DBOOST_USER_CONFIG="<config.h>" \
lyx-devel/boost/libs/regex/src/Makefile.am:     
-DBOOST_USER_CONFIG="<config.h>" \
lyx-devel/boost/libs/signals/src/Makefile.in:   
-DBOOST_USER_CONFIG="<config.h>" \
lyx-devel/boost/libs/signals/src/Makefile.am:   
-DBOOST_USER_CONFIG="<config.h>" \
lyx-devel/boost/libs/filesystem/src/Makefile.in:        
-DBOOST_USER_CONFIG="<config.h>" \
lyx-devel/boost/libs/filesystem/src/Makefile.am:        
-DBOOST_USER_CONFIG="<config.h>" \

The code in libs/signals/src/Makefile.am libs/regex/src/Makefile.am
and looks like 

AM_CPPFLAGS += \
        $(PCH_FLAGS) \
        -DBOOST_USER_CONFIG="<config.h>" \
        $(BOOST_INCLUDES)

I guess it should be replaced in 1.3.x by

AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"

Bennett, does the following patch help?

JMarc

Index: libs/regex/src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/regex/src/Makefile.am,v
retrieving revision 1.5.2.1
diff -u -p -r1.5.2.1 Makefile.am
--- libs/regex/src/Makefile.am	5 Apr 2004 15:59:46 -0000	1.5.2.1
+++ libs/regex/src/Makefile.am	5 Aug 2005 14:50:24 -0000
@@ -4,6 +4,8 @@ noinst_LTLIBRARIES = libboostregex.la
 
 INCLUDES = $(BOOST_INCLUDES)
 
+AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
+
 libboostregex_la_SOURCES = \
 	cpp_regex_traits.cpp \
 	c_regex_traits_common.cpp \
Index: libs/signals/src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/boost/libs/signals/src/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- libs/signals/src/Makefile.am	26 May 2002 13:02:17 -0000	1.1
+++ libs/signals/src/Makefile.am	5 Aug 2005 14:50:24 -0000
@@ -4,6 +4,8 @@ noinst_LTLIBRARIES = libboostsignals.la
 
 INCLUDES = $(BOOST_INCLUDES)
 
+AM_CPPFLAGS = -DBOOST_USER_CONFIG="<config.h>"
+
 libboostsignals_la_SOURCES = \
 	connection.cpp \
 	signal_base.cpp \

Reply via email to