anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-21 17:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

3rdparty/boost: build with autotools

Browse Source
This commit is contained in:
Peter Kümmel 2015-12-20 13:06:59 +01:00
parent b7a3831289
commit a8d78905b6
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3rdparty/Makefile.am vendored
View File

@ -1,6 +1,9 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
DIST_SUBDIRS = hunspell libiconv zlib DIST_SUBDIRS = boost hunspell libiconv zlib
SUBDIRS = hunspell libiconv zlib if USE_INCLUDED_BOOST
BOOST = boost
endif
SUBDIRS = $(BOOST)

7
Makefile.am
View File

@ -5,17 +5,14 @@ ACLOCAL_AMFLAGS = -I m4 -I config
MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
$(srcdir)/config.h.in $(srcdir)/config.h.in
DIST_SUBDIRS = 3rdparty autotests m4 config development po boost src sourcedoc lib DIST_SUBDIRS = 3rdparty autotests m4 config development po src sourcedoc lib
if BUILD_CLIENT_SUBDIR if BUILD_CLIENT_SUBDIR
CLIENT = src/client CLIENT = src/client
endif endif
if USE_INCLUDED_BOOST
BOOST = boost
endif
SUBDIRS = autotests config development po $(BOOST) src sourcedoc lib \ SUBDIRS = autotests config development po 3rdparty src sourcedoc lib \
$(CLIENT) src/tex2lyx $(CLIENT) src/tex2lyx

4
config/lyxinclude.m4
View File

@ -377,8 +377,8 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes) AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
AC_MSG_RESULT([$lyx_cv_with_included_boost]) AC_MSG_RESULT([$lyx_cv_with_included_boost])
if test x$lyx_cv_with_included_boost = xyes ; then if test x$lyx_cv_with_included_boost = xyes ; then
BOOST_INCLUDES='-I$(top_srcdir)/boost' BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost'
BOOST_LIBS='$(top_builddir)/boost/liblyxboost.a' BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a'
else else
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
save_LIBS=$LIBS save_LIBS=$LIBS

2
configure.ac
View File

@ -350,11 +350,11 @@ AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
AC_CONFIG_FILES([Makefile \ AC_CONFIG_FILES([Makefile \
lyx.1:lyx.1in \ lyx.1:lyx.1in \
3rdparty/Makefile \ 3rdparty/Makefile \
3rdparty/boost/Makefile \
3rdparty/hunspell/Makefile \ 3rdparty/hunspell/Makefile \
3rdparty/libiconv/Makefile \ 3rdparty/libiconv/Makefile \
3rdparty/zlib/Makefile \ 3rdparty/zlib/Makefile \
autotests/Makefile \ autotests/Makefile \
boost/Makefile \
config/Makefile \ config/Makefile \
development/Makefile \ development/Makefile \
development/MacOSX/Makefile \ development/MacOSX/Makefile \