X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=38b20870b4308519b5f09efc33ee51fcd8d1c529;hb=6b5ce8a999028cefcf47a127ec5e8384f24d13dd;hp=65052e8a6b7211a545f8a6d9ce5de34439628e55;hpb=6bb9cf4918941fc0c62c1f1d1dadb53a152c3cef;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 65052e8a6b..38b20870b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(LyX,2.0.0svn,[lyx-devel@lists.lyx.org],[lyx])
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2008-11-15"])
+AC_SUBST(LYX_DATE, ["2009-03-25"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])
@@ -19,7 +19,7 @@ LYX_USE_PACKAGING
 # AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING.
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 
-dnl default maintainer mode to true for development versions
+dnl Default maintainer mode to true for development versions
 if test "${enable_maintainer_mode+set}" != set; then
   enable_maintainer_mode=$lyx_devel_version
 fi
@@ -358,6 +358,7 @@ char * strerror(int n);
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
+#  define NOMINMAX
 #  define BOOST_POSIX 1
 #  define BOOST_POSIX_API 1
 #  define BOOST_POSIX_PATH 1
@@ -384,48 +385,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 -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})
@@ -469,8 +448,10 @@ AC_CONFIG_FILES([Makefile \
       sourcedoc/Doxyfile \
       sourcedoc/Makefile \
       src/client/Makefile \
+      src/client/lyxclient.1:src/client/lyxclient.1in \
       src/Makefile \
       src/tex2lyx/Makefile \
+      src/tex2lyx/tex2lyx.1:src/tex2lyx/tex2lyx.1in \
       src/support/Makefile \
       src/frontends/Makefile \
       src/frontends/qt4/Makefile