Small glitch in CharacterUi.ui

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d1789d39ad621487a63c2a5cb039d210fe591faf..a4a929988decc0c7406b707ba97fa293887c018a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,8 @@ LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
 ### These are needed in windows
 AC_CHECK_LIB(shlwapi, main, [LIBSHLWAPI=-lshlwapi])
 AC_SUBST(LIBSHLWAPI)
+AC_CHECK_LIB(psapi, main, [LIBPSAPI=-lpsapi])
+AC_SUBST(LIBPSAPI)
 AC_CHECK_LIB(gdi32, main)
 
 AC_ARG_WITH(mythes,
@@ -385,48 +387,26 @@ char * strerror(int n);
 #endif
 ])
 
-
-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")
+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=])
+
+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})