anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow boost as system shared libarry

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6948 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-05-07 16:22:01 +00:00
parent 65416ed3ee
commit ac1faa8439
8 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> 2003-04-25 Lars Gullik Bjønnes <larsbj@gullik.net>
* dummy entry * dummy entry

6
Makefile.am
View File

@ -6,7 +6,13 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
$(srcdir)/configure \ $(srcdir)/configure \
$(srcdir)/acinclude.m4 $(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 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 \ EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
UPGRADING lyx.man autogen.sh images UPGRADING lyx.man autogen.sh images

13
config/ChangeLog
View File

@ -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> 2003-05-07 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lyxinclude213.m4 (AC_HELP_STRING): replace with a hackish but * lyxinclude213.m4 (AC_HELP_STRING): replace with a hackish but
@ -9,17 +16,17 @@
2003-04-11 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2003-04-11 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.in (ALL_LINGUAS): * configure.in (ALL_LINGUAS):
* configure.ac (ALL_LINGUAS): add nn (nynorsk) * configure.ac (ALL_LINGUAS): add nn (nynorsk)
2003-04-01 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2003-04-01 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.in: * configure.in:
* configure.ac: move AM_MAINTAINER_MODE later * configure.ac: move AM_MAINTAINER_MODE later
2003-03-26 Jean-Marc Lasgouttes <lasgouttes@lyx.org> 2003-03-26 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.in: * configure.in:
* configure.ac: use AM_MAINTAINER_MODE * configure.ac: use AM_MAINTAINER_MODE
2003-03-25 John Levon <levon@movementarian.org> 2003-03-25 John Levon <levon@movementarian.org>

2
config/common.am
View File

@ -8,6 +8,8 @@ AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
ETAGS_ARGS = --lang=c++ ETAGS_ARGS = --lang=c++
if USE_INCLUDED_BOOST
BOOST_INCLUDES = -I$(top_srcdir)/boost BOOST_INCLUDES = -I$(top_srcdir)/boost
endif
LIBS = LIBS =

7
config/configure.ac
View File

@ -123,6 +123,8 @@ AC_CHECK_LIB(Aiksaurus, main,
fi fi
AC_SUBST(AIKSAURUS_LIBS) AC_SUBST(AIKSAURUS_LIBS)
LYX_USE_INCLUDED_BOOST
### Setup libtool ### Setup libtool
AC_DISABLE_SHARED AC_DISABLE_SHARED
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
@ -339,6 +341,11 @@ int mkstemp(char*);
#define USE_BOOST_FORMAT 0 #define USE_BOOST_FORMAT 0
#endif #endif
#define BOOST_DISABLE_THREADS 1
#define BOOST_NO_EXCEPTIONS 1
#define BOOST_NO_WREGEX 1
#define BOOST_NO_WSTRING 1
#endif #endif
]) ])

11
config/lyxinclude.m4
View File

@ -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 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 has a std::string that is close to the standard. So close that
dnl methods not found in "unstandard" std::strings are present here. dnl methods not found in "unstandard" std::strings are present here.

2
src/ChangeLog
View File

@ -1,5 +1,7 @@
2003-05-07 Lars Gullik Bjønnes <larsbj@gullik.net> 2003-05-07 Lars Gullik Bjønnes <larsbj@gullik.net>
* Makefile.am (BOOST_LIBS): allow boost as system lib.
* text2.C (changeDepth): parlist cleanup * text2.C (changeDepth): parlist cleanup
(getColumnNearX): ditto (getColumnNearX): ditto

4
src/Makefile.am
View File

@ -13,8 +13,12 @@ LYX_CONV_LIBS = mathed/libmathed.la insets/libinsets.la \
graphics/libgraphics.la \ graphics/libgraphics.la \
support/libsupport.la support/libsupport.la
if USE_INCLUDED_BOOST
BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \ BOOST_LIBS = ../boost/libs/regex/src/libboostregex.la \
../boost/libs/signals/src/libboostsignals.la ../boost/libs/signals/src/libboostsignals.la
else
BOOST_LIBS = -lboost_regex -lboost_signals
endif
lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \ lyx_LDADD = $(LYX_CONV_LIBS) $(BOOST_LIBS) $(INTLLIBS) \
$(AIKSAURUS_LIBS) @LIBS@ $(AIKSAURUS_LIBS) @LIBS@