anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace the --enable-monolithic-xxx flags by the new --enable-monolithic-build; the old ones still work

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29159 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2009-04-09 16:07:45 +00:00
parent b873bad635
commit b7c22012fe
3 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
INSTALL
View File

@ -249,10 +249,10 @@ The following options allow to tweak more precisely the generated code:
want to use. The default value is qt4, which is the only available
frontend for now.
o --enable-monolithic-[boost,client,insets,mathed,core,tex2lyx,frontend-qt4]
that enable monolithic build of the given part of the source code. This
should reduce the compilation time provided you have enough memory
(>500MB).
o --enable-monolithic-build[=boost,client,insets,mathed,core,tex2lyx,frontend-qt4]
that enables to build the given parts of the source code as one
big file. This should reduce the compilation time, provided you
have enough memory (>500MB).
Compiling and installing LyX

60
configure.ac
View File

@ -379,48 +379,26 @@ char * strerror(int n);
#endif
])
m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt4])
AC_ARG_ENABLE(monolithic-build,
AC_HELP_STRING([--enable-monolithic-build@<:@=LIST@:>@],
[Use monolithic build for modules in LIST (default: ALLPARTS)]),
[test "$enable_monolithic_build" = yes && enable_monolithic_build="ALLPARTS"
test "$enable_monolithic_build" = no && enable_monolithic_build=
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=" ,"
for i in $enable_monolithic_build ; do
eval "enable_monolithic_$i=yes"
done
IFS="$ac_save_ifs"],
[enable_monolithic_build=])
AC_ARG_ENABLE(monolithic-boost,
AC_HELP_STRING([--enable-monolithic-boost],
[Use monolithic boost compilations]),,
[enable_monolithic_boost=no])
AM_CONDITIONAL(MONOLITHIC_BOOST, test "$enable_monolithic_boost" = "yes")
AC_ARG_ENABLE(monolithic-client,
AC_HELP_STRING([--enable-monolithic-client],
[Use monolithic client compilations]),,
[enable_monolithic_client=no])
AM_CONDITIONAL(MONOLITHIC_CLIENT, test "$enable_monolithic_client" = "yes")
AC_ARG_ENABLE(monolithic-insets,
AC_HELP_STRING([--enable-monolithic-insets],
[Use monolithic insets compilations]),,
[enable_monolithic_insets=no])
AM_CONDITIONAL(MONOLITHIC_INSETS, test "$enable_monolithic_insets" = "yes")
AC_ARG_ENABLE(monolithic-mathed,
AC_HELP_STRING([--enable-monolithic-mathed],
[Use monolithic mathed compilations]),,
[enable_monolithic_mathed=no])
AM_CONDITIONAL(MONOLITHIC_MATHED, test "$enable_monolithic_mathed" = "yes")
AC_ARG_ENABLE(monolithic-core,
AC_HELP_STRING([--enable-monolithic-core],
[Use monolithic core files compilations]),,
[enable_monolithic_core=no])
AM_CONDITIONAL(MONOLITHIC_CORE, test "$enable_monolithic_core" = "yes")
AC_ARG_ENABLE(monolithic-tex2lyx,
AC_HELP_STRING([--enable-monolithic-tex2lyx],
[Use monolithic tex2lyx compilations]),,
[enable_monolithic_tex2lyx=no])
AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "$enable_monolithic_tex2lyx" = "yes")
AC_ARG_ENABLE(monolithic-frontend-qt4,
AC_HELP_STRING([--enable-monolithic-frontend-qt4],
[Use monolithic compilation of the Qt 4 frontend. Only recommended with > 512 MB of RAM]),,
[enable_monolithic_frontend_qt4=no])
AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "$enable_monolithic_frontend_qt4" = "yes")
AM_CONDITIONAL(MONOLITHIC_BOOST, test "x$enable_monolithic_boost" = "xyes")
AM_CONDITIONAL(MONOLITHIC_CLIENT, test "x$enable_monolithic_client" = "xyes")
AM_CONDITIONAL(MONOLITHIC_INSETS, test "x$enable_monolithic_insets" = "xyes")
AM_CONDITIONAL(MONOLITHIC_MATHED, test "x$enable_monolithic_mathed" = "xyes")
AM_CONDITIONAL(MONOLITHIC_CORE, test "x$enable_monolithic_core" = "xyes")
AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "x$enable_monolithic_tex2lyx" = "xyes")
AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "x$enable_monolithic_frontend_qt4" = "xyes")
MSYS_AC_CANONICAL_PATH(lyx_abs_top_srcdir, ${srcdir})
MSYS_AC_CANONICAL_PATH(lyx_abs_installed_localedir, ${real_localedir})

3
status.16x
View File

@ -255,4 +255,7 @@ What's new
- Fix "make check" with gcc 4.3.
- New --enable-monolithic-build configure option that subsumes the
previously existing monolithic flags;
- Fix monolithic build.