X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=30ac13ab273bd41e9729147d56ba470d82fa1da9;hb=7fe51efeb8add4bed09207674fd538e4f0288ac2;hp=b81d01897f6992b25c8f93b52a9238a14e196b08;hpb=67e61a395698fdfc8a50d2af593b1c2dd89ac018;p=lyx.git diff --git a/configure.ac b/configure.ac index b81d01897f..30ac13ab27 100644 --- 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 @@ -289,20 +296,20 @@ real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"` real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"` VERSION_INFO="Configuration\n\ - Host type: ${host}\n\ - Special build flags: ${lyx_flags}\n\ - C Compiler: ${CC} ${CC_VERSION}\n\ - C Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CFLAGS}\n\ - C Compiler flags: ${CPPFLAGS} ${CFLAGS}\n\ - C++ Compiler: ${CXX} ${CXX_VERSION}\n\ - C++ Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\ - C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\ - Linker flags: ${AM_LDFLAGS}\n\ - Linker user flags: ${LDFLAGS}\n\ + Host type: ${host}\n\ + Special build flags: ${lyx_flags}\n\ + C Compiler: ${CC} ${CC_VERSION}\n\ + C Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CFLAGS}\n\ + C Compiler flags: ${CPPFLAGS} ${CFLAGS}\n\ + C++ Compiler: ${CXX} ${CXX_VERSION}\n\ + C++ Compiler LyX flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\ + C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\ + Linker flags: ${AM_LDFLAGS}\n\ + Linker user flags: ${LDFLAGS}\n\ ${FRONTEND_INFO}\ - Packaging: ${lyx_use_packaging}\n\ - LyX binary dir: ${real_bindir}\n\ - LyX files dir: ${real_pkgdatadir}\n" + Packaging: ${lyx_use_packaging}\n\ + LyX binary dir: ${real_bindir}\n\ + LyX files dir: ${real_pkgdatadir}\n" MSYS_AC_CANONICAL_PATH(LYX_ABS_TOP_SRCDIR, ${srcdir}) MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_LOCALEDIR, ${real_localedir}) @@ -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,41 +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 \ - src/frontends/qt4/ui/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