X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=2be419db4ef147b6834e91189ad40f5d4c76010e;hb=0b06fd0118ab0e486f1a426740ab3d783f31057d;hp=9860f11596666c81a0ea78d433c91fd7b9bfa0d4;hpb=77cfe019f21bfc8649a7367e367dd1f568959dc3;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 9860f11596..2be419db4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,6 +282,13 @@ LIBS="$save_LIBS"
 AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
 AC_LANG_POP(C)
 
+lyx_win_res=false;
+case ${host} in
+    *mingw*|*cygwin*) lyx_win_res=true;;
+esac
+AM_CONDITIONAL(LYX_WIN_RESOURCE, $lyx_win_res)
+LYX_SET_VERSION_INFO
+
 AC_FUNC_SELECT_ARGTYPES
 
 ### Some information on what just happened
@@ -383,7 +390,7 @@ char * strerror(int n);
  * does: What we need is a 32bit wide wchar_t, and a libstdc++ that
  * has the needed wchar_t support and uses UCS4. Whether it
  * implements this with the help of libc, or whether it has own code
- * does not matter for us, because we don't use libc directly (Georg)
+ * does not matter for us, because we do not use libc directly (Georg)
 */
 #if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
 #  define USE_WCHAR_T
@@ -392,8 +399,20 @@ 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_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release])
 AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info])
+AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number])
+AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number])
+AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number])
+AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
 
 ### Finish the work.
 AC_CONFIG_FILES([Makefile