Minor adjustment to previous commit.

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f0a286d14baf6dff2cedb33fbd95c67a5952d315..a0353474772b3b7ed2cb8c84ce7895a844f2b5ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,13 +77,13 @@ AC_LANG(C++)
 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,
@@ -100,7 +100,7 @@ if test "x$enable_assertions" = xyes ; then
 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)
@@ -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,40 +399,57 @@ char * strerror(int n);
 #endif
 ])
 
-### Finish the work.
+
+AC_ARG_WITH(qmake,
+       AC_HELP_STRING([--with-qmake],
+               [Use qmake instead of automake to generate Makefiles]),,
+       [with_qmake=no])
+
+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])
+
+
 AC_CONFIG_FILES([Makefile
-       boost/Makefile \
-       config/Makefile \
-       development/Makefile \
-       development/MacOSX/Makefile \
-       development/MacOSX/Info.plist \
-       development/MacOSX/lyxrc.dist \
-       development/MacOSX/spotlight/Makefile \
-       development/lyx.spec \
-       intl/Makefile \
-       lib/Makefile \
-       lib/doc/Makefile \
-       lib/lyx2lyx/lyx2lyx_version.py \
-       lib/lyx2lyx/Makefile \
-       m4/Makefile \
-       po/Makefile.in \
-       sourcedoc/Doxyfile \
-       sourcedoc/Makefile \
-       src/client/Makefile \
-       src/Makefile \
-       src/version.cpp-tmp:src/version.cpp.in \
-       src/tex2lyx/Makefile \
-       src/mathed/Makefile \
-       src/graphics/Makefile \
-       src/insets/Makefile \
-       src/support/Makefile \
-       src/support/tests/Makefile \
-       src/frontends/Makefile \
-       src/frontends/controllers/Makefile \
-       src/frontends/controllers/tests/Makefile \
-       src/frontends/qt4/Makefile \
+      boost/Makefile \
+      config/Makefile \
+      development/Makefile \
+      development/MacOSX/Makefile \
+      development/MacOSX/Info.plist \
+      development/MacOSX/lyxrc.dist \
+      development/MacOSX/spotlight/Makefile \
+      development/lyx.spec \
+      intl/Makefile \
+      lib/Makefile \
+      lib/doc/Makefile \
+      lib/lyx2lyx/lyx2lyx_version.py \
+      lib/lyx2lyx/Makefile \
+      m4/Makefile \
+      po/Makefile.in \
+      sourcedoc/Doxyfile \
+      sourcedoc/Makefile \
+      src/client/Makefile \
+      src/Makefile \
+      src/tex2lyx/Makefile \
+      src/support/Makefile \
+      src/frontends/Makefile \
+      src/frontends/controllers/Makefile \
+      src/frontends/qt4/Makefile
 ])
 
+
+test x$with_qmake = xyes && ${srcdir}/development/qmake/doit
+
+
 AC_OUTPUT
 # show version information
 echo