dnl we do not need that currently (and probably all our supported
dnl compiler allow that)
dnl LYX_CXX_PARTIAL
-LYX_CXX_EXPLICIT
+dnl LYX_CXX_EXPLICIT
LYX_CXX_GLOBAL_CSTD
-LYX_STD_COUNT
+dnl LYX_STD_COUNT
dnl we disable rtti for now
dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
-LYX_CXX_STL_MODERN_STREAMS
+dnl AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
+dnl LYX_CXX_STL_MODERN_STREAMS
### and now some special lyx flags.
AC_ARG_ENABLE(assertions,
fi
### Library Files
-AC_CHECK_LIB(m, sin)
+dnl AC_CHECK_LIB(m, sin)
### Add extra directories to check for libraries.
LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
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
* 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
#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
boost/Makefile \
sourcedoc/Makefile \
src/client/Makefile \
src/Makefile \
- src/version.cpp-tmp:src/version.cpp.in \
src/tex2lyx/Makefile \
src/support/Makefile \
src/frontends/Makefile \