From 28058889fa95ce89b5ef64cbe4f972d797ebfb4b Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 9 Sep 2004 09:29:04 +0000 Subject: [PATCH] fix building client with included gettext git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8970 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/client/ChangeLog | 5 +++++ src/client/Makefile.am | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/client/ChangeLog b/src/client/ChangeLog index 24373f5004..9db3fb7679 100644 --- a/src/client/ChangeLog +++ b/src/client/ChangeLog @@ -1,3 +1,8 @@ +2004-09-09 Jean-Marc Lasgouttes + + * Makefile.am (BOOST_LIBS): fix when using already installed boost. + (lyxclient_LDADD): add $(BOOST_LIBS) and $(INTLLIBS) + 2004-09-06 Jean-Marc Lasgouttes * Makefile.am (INCLUDES): add ${srcdir}/.. to INCLUDES (needed diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 41afc46dc1..8a32f270e3 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -10,10 +10,16 @@ INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES) AM_CXXFLAGS = $(PCH_FLAGS) +if USE_INCLUDED_BOOST +BOOST_LIBS = $(top_builddir)/boost/libs/filesystem/src/libboostfilesystem.la \ + $(top_builddir)/boost/libs/regex/src/libboostregex.la +else +BOOST_LIBS = -lboost_regex -lboost_filesystem +endif + lyxclient_LDADD = \ $(top_builddir)/src/support/libsupport.la \ - $(top_builddir)/boost/libs/filesystem/src/libboostfilesystem.la \ - $(top_builddir)/boost/libs/regex/src/libboostregex.la + $(BOOST_LIBS) $(INTLLIBS) lyxclient_SOURCES = \ boost.C \ -- 2.39.5