From 309c75046e71cc78f1968cff8ee10aaae1a62af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Matox?= Date: Fri, 21 Sep 2007 07:18:21 +0000 Subject: [PATCH] Make --without-include-boost compile (autotools) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20407 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/common.am | 1 + src/tex2lyx/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/common.am b/config/common.am index 885fd48c13..c9d86b322b 100644 --- a/config/common.am +++ b/config/common.am @@ -37,6 +37,7 @@ BOOST_FILESYSTEM = -lboost_filesystem BOOST_REGEX = -lboost_regex BOOST_SIGNALS = -lboost_signals BOOST_IOSTREAMS = -lboost_iostreams +BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS) endif LIBS = diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 5329a5701e..c6df6470d2 100644 --- a/src/tex2lyx/Makefile.am +++ b/src/tex2lyx/Makefile.am @@ -63,8 +63,7 @@ tex2lyx_SOURCES = \ tex2lyx_LDADD = \ $(top_builddir)/src/support/liblyxsupport.la \ - $(top_builddir)/boost/liblyxboost.la \ - $(LIBICONV) @LIBS@ + $(LIBICONV) $(BOOST_LIBS) @LIBS@ tex2lyx.1: cp -p $(srcdir)/tex2lyx.man tex2lyx.1