allow boost as system shared libarry

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6948 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 47f4d1b229105e9b7f9ce4f0969d0b6017a10ece..be9b5247c7ba733fed031dd666a430a0062c5691 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-07  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * Makefile.am: allow boost as system lib
+
 2003-04-25  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * dummy entry

diff --git a/Makefile.am b/Makefile.am
index 5eaf4efa2103720fbc87d12934d001fb83deb8bb..2f77f41a6fa1e720d1a0e48b470ee3f660b26d9c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,13 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
        $(srcdir)/configure \
        $(srcdir)/acinclude.m4
 
+DIST_SUBDIRS = config development intl po boost src sourcedoc lib
+
+if USE_INCLUDED_BOOST
 SUBDIRS = config development intl po boost src sourcedoc lib
+else
+SUBDIRS = config development intl po src sourcedoc lib
+endif
 
 EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
        UPGRADING lyx.man autogen.sh images

diff --git a/config/ChangeLog b/config/ChangeLog
index 2e46ab3b4d7955b92ac4ce727ae6af21aa33141b..f477030e3ec9d52e208a97b3e99baf97832c4eda 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-07  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * lyxinclude.m4 (LYX_USE_INCLUDED_BOOST): new m4 function
+
+       * configure.ac: allow boost as system lib
+       * common.am: ditto
+
 2003-05-07  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * lyxinclude213.m4 (AC_HELP_STRING): replace with a hackish but
@@ -9,17 +16,17 @@
 
 2003-04-11  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
-       * configure.in (ALL_LINGUAS): 
+       * configure.in (ALL_LINGUAS):
        * configure.ac (ALL_LINGUAS): add nn (nynorsk)
 
 2003-04-01  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
-       * configure.in: 
+       * configure.in:
        * configure.ac: move AM_MAINTAINER_MODE later
 
 2003-03-26  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
-       * configure.in: 
+       * configure.in:
        * configure.ac: use AM_MAINTAINER_MODE
 
 2003-03-25  John Levon  <levon@movementarian.org>

diff --git a/config/common.am b/config/common.am
index 02cf7663283bf8333d66749c45fd7acfb18bd230..476213313a1344aba9a51a27fbfb6c209abdeaf1 100644 (file)
--- a/config/common.am
+++ b/config/common.am
@@ -8,6 +8,8 @@ AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
 
 ETAGS_ARGS = --lang=c++
 
+if USE_INCLUDED_BOOST
 BOOST_INCLUDES = -I$(top_srcdir)/boost
+endif
 
 LIBS =

diff --git a/config/configure.ac b/config/configure.ac
index 7c3628e0b6ad808877626dd0f8ce0d5ee99cca41..5d21ced3b07ba89fe6c699bc9ed45ce22e34700d 100644 (file)
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -123,6 +123,8 @@ AC_CHECK_LIB(Aiksaurus, main,
 fi
 AC_SUBST(AIKSAURUS_LIBS)
 
+LYX_USE_INCLUDED_BOOST
+
 ### Setup libtool
 AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
@@ -339,6 +341,11 @@ int mkstemp(char*);
 #define USE_BOOST_FORMAT 0
 #endif
 
+#define BOOST_DISABLE_THREADS 1
+#define BOOST_NO_EXCEPTIONS 1
+#define BOOST_NO_WREGEX 1
+#define BOOST_NO_WSTRING 1
+
 #endif
 ])
 

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 2d42b60cfb80bbdca7e1a89cd764229c33536bae..8d79706a66881e0c638bf05eadda537a056a7ffc 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -397,6 +397,17 @@ dnl    AC_MSG_RESULT([$with_included_string])
 ])
 
 
+dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
+dnl        be used.
+AC_DEFUN(LYX_USE_INCLUDED_BOOST,[
+       AC_ARG_WITH(included-boost,
+           [  --with-included-boost  use the boost lib supplied with LyX],
+           [lyx_cv_with_included_boost=$withval
+               AC_MSG_RESULT([$with_included_boost])],
+           [lyx_cv_with_included_boost=yes])
+       AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
+])
+
 dnl Usage: LYX_CXX_GOOD_STD_STRING : checks whether the C++ compiler
 dnl   has a std::string that is close to the standard. So close that
 dnl   methods not found in "unstandard" std::strings are present here.

diff --git a/src/ChangeLog b/src/ChangeLog
index c0978ce2ee3cfa916dba8e4d61f4941ad02d2886..f0ff9fbc0cee4ee9458c75c86e4ed91e9c009f77 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2003-05-07  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
+       * Makefile.am (BOOST_LIBS): allow boost as system lib.
+
        * text2.C (changeDepth): parlist cleanup
        (getColumnNearX): ditto
 

diff --git a/src/Makefile.am b/src/Makefile.am
index ba22e54778ca1befa50438033d1528cf280d4823..fde7fe10520065c82c34feffb8220e84c1e0e175 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,8 +13,12 @@ LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
        graphics/libgraphics.la \
        support/libsupport.la
 
+if USE_INCLUDED_BOOST
 BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
        ../boost/libs/signals/src/libboostsignals.la
+else
+BOOST_LIBS = -lboost_regex -lboost_signals
+endif
 
 lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
        $(AIKSAURUS_LIBS) @LIBS@