get rid of old --enable-monolithic-foo options; document new option

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

diff --git a/INSTALL b/INSTALL
index b5e45530a13c23d126556327e5092e75bdadd1e9..24c55ea10c23cdbfecdfdfd484a8771558628783 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -249,8 +249,8 @@ 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
+  o --enable-monolithic-build[=boost,client,insets,mathed,core,tex2lyx,frontend-qt4]
+    that enable monolithic build of the given parts of the source code. This
     should reduce the compilation time provided you have enough memory
     (>500MB).
 

diff --git a/configure.ac b/configure.ac
index c20284100041599f0179631b11b7d54a789a8b32..38b20870b4308519b5f09efc33ee51fcd8d1c529 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -385,58 +385,26 @@ char * strerror(int n);
 #endif
 ])
 
-m4_define([ALLPARTS],boost client insets mathed core tex2lyx frontend_qt4)
+m4_define([ALLPARTS],[boost,client,insets,mathed,core,tex2lyx,frontend_qt4])
 AC_ARG_ENABLE(monolithic-build,
-  AC_HELP_STRING([--enable-monolithic-build<=LIST>],
+  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],
+   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 -n "$enable_monolithic_boost")
+AM_CONDITIONAL(MONOLITHIC_CLIENT, test -n "$enable_monolithic_client")
+AM_CONDITIONAL(MONOLITHIC_INSETS, test -n "$enable_monolithic_insets")
+AM_CONDITIONAL(MONOLITHIC_MATHED, test -n "$enable_monolithic_mathed")
+AM_CONDITIONAL(MONOLITHIC_CORE, test -n "$enable_monolithic_core")
+AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test -n "$enable_monolithic_tex2lyx")
+AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test -n "$enable_monolithic_frontend_qt4")
 
 MSYS_AC_CANONICAL_PATH(lyx_abs_top_srcdir, ${srcdir})
 MSYS_AC_CANONICAL_PATH(lyx_abs_installed_localedir, ${real_localedir})