X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=a3f89a5ef412eb94ff8d8af2eb0b942d0c015085;hb=5d96ee69eb9173779932575cb6d6ce70db9860b9;hp=bffded3ae49ba8102cfb80768f9fe2400f95eab3;hpb=042128b643d135a6aa8031e27784d77b2c593ef7;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index bffded3ae4..a3f89a5ef4 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -63,7 +63,16 @@ AC_MSG_RESULT([$withval]) ]) -dnl Check whether to configure for Qt4 or Qt5. Default is Qt5. +dnl Check whether to configure for Qt4, Qt5, or Qt6. Default is Qt5. +dnl +AC_DEFUN([LYX_CHECK_QT6],[ +AC_MSG_CHECKING([whether Qt6 is requested]) +AC_ARG_ENABLE([qt6], + [AS_HELP_STRING([--enable-qt6],[use Qt6 for building])], + USE_QT6=$enableval, USE_QT6=no) +AC_MSG_RESULT([$USE_QT6]) +AC_SUBST([USE_QT6]) +]) dnl AC_DEFUN([LYX_CHECK_QT5],[ AC_MSG_CHECKING([whether Qt5 is disabled]) @@ -213,46 +222,6 @@ AC_DEFUN([LYX_CXX_CXX11_FLAGS], ]) -dnl Usage: LYX_CXX_USE_REGEX -dnl decide whether we want to use std::regex and set the -dnl LYX_USE_STD_REGEX macro and conditional accordingly. -AC_DEFUN([LYX_CXX_USE_REGEX], -[AC_ARG_ENABLE(std-regex, - AS_HELP_STRING([--enable-std-regex],[use std::regex instead of boost::regex (default is autodetected)]), - [lyx_std_regex=$enableval], - [AC_MSG_CHECKING([for correct regex implementation]) - save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" - # The following code snippet has been taken taken from example in - # http://stackoverflow.com/questions/8561850/compile-stdregex-iterator-with-gcc - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - - #include - - typedef std::regex_iterator Myiter; - ]], [[ - const char *pat = "axayaz"; - Myiter::regex_type rx("a"); - Myiter next(pat, pat + strlen(pat), rx); - Myiter end; - ]])],[lyx_std_regex=yes],[lyx_std_regex=no]) - CXXFLAGS=$save_CXXFLAGS - CPPFLAGS=$save_CPPFLAGS - AC_MSG_RESULT([$lyx_std_regex]) - ]) - - if test $lyx_std_regex = yes ; then - lyx_flags="$lyx_flags std-regex" - AC_DEFINE([LYX_USE_STD_REGEX], 1, [define to 1 if std::regex should be preferred to boost::regex]) - fi - AM_CONDITIONAL([LYX_USE_STD_REGEX], test $lyx_std_regex = yes) -]) - - dnl Usage: LYX_CXX_USE_CALL_ONCE dnl check whether we can use std::call_once and set the dnl LYX_USE_STD_CALL_ONCE macro and conditional accordingly. @@ -310,8 +279,8 @@ AC_REQUIRE([AC_PROG_CXXCPP]) ### We might want to force the C++ standard. AC_ARG_ENABLE(cxx-mode, - AS_HELP_STRING([--enable-cxx-mode],[choose C++ standard (default: 14, then 11)]),, - [enable_cxx_mode={14,11}] + AS_HELP_STRING([--enable-cxx-mode],[choose C++ standard (default: 17, 14, then 11)]),, + [enable_cxx_mode={17,14,11}] ) AC_LANG_PUSH(C++) @@ -319,7 +288,6 @@ LYX_PROG_CLANG LYX_CXX_CXX11_FLAGS($enable_cxx_mode) LYX_LIB_STDCXX LYX_LIB_STDCXX_CXX11_ABI -LYX_CXX_USE_REGEX LYX_CXX_USE_CALL_ONCE AC_LANG_POP(C++) @@ -413,7 +381,7 @@ if test x$GXX = xyes; then AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer" fi - if test x$USE_QT5 = xyes ; then + if test x$USE_QT5 = xyes -o x$USE_QT6 = xyes; then AS_CASE([$host], [*mingw*|*cygwin*], [], [AM_CXXFLAGS="-fPIC $AM_CXXFLAGS"]) fi dnl Warnings are for preprocessor too @@ -427,7 +395,7 @@ if test x$GXX = xyes; then AC_LANG_POP(C++) fi case $gxx_version in - 2.*|3.*|4.@<:@0-6@:>@) AC_MSG_ERROR([gcc >= 4.7 is required]);; + 2.*|3.*|4.@<:@0-8@:>@*) AC_MSG_ERROR([gcc >= 4.9 is required]);; esac if test x$enable_stdlib_debug = xyes ; then dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0 @@ -457,68 +425,63 @@ if test x$GXX = xyes; then fi ]) +dnl Usage: LYX_USE_INCLUDED_NOD : select if the included nod should be used. +AC_DEFUN([LYX_USE_INCLUDED_NOD],[ + AC_MSG_CHECKING([whether to use included nod library]) + AC_ARG_WITH(included-nod, + [AS_HELP_STRING([--without-included-nod], [do not use the nod lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], + [lyx_cv_with_included_nod=$withval], + [lyx_cv_with_included_nod=yes]) + AM_CONDITIONAL(USE_INCLUDED_NOD, test x$lyx_cv_with_included_nod = xyes) + AC_MSG_RESULT([$lyx_cv_with_included_nod]) + if test x$lyx_cv_with_included_nod = xyes ; then + lyx_included_libs="$lyx_included_libs nod" + NOD_INCLUDES='-I$(top_srcdir)/3rdparty/nod' + else + NOD_INCLUDES= + AC_LANG_PUSH(C++) + AC_MSG_CHECKING([for nod library]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include ], + [nod::scoped_connection conn;])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot find suitable nod library (do not use --without-included-nod)]) + ]) + AC_LANG_POP(C++) + fi + AC_SUBST(NOD_INCLUDES) +]) + dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should dnl be used. AC_DEFUN([LYX_USE_INCLUDED_BOOST],[ AC_MSG_CHECKING([whether to use included boost library]) AC_ARG_WITH(included-boost, - [AS_HELP_STRING([--without-included-boost], [do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], + [AS_HELP_STRING([--with-included-boost], [use the boost lib supplied with LyX])], [lyx_cv_with_included_boost=$withval], - [lyx_cv_with_included_boost=yes]) + [lyx_cv_with_included_boost=no]) AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes) AC_MSG_RESULT([$lyx_cv_with_included_boost]) + if test x$lyx_cv_with_included_boost = xno ; then + AC_LANG_PUSH(C++) + AC_MSG_CHECKING([for boost library]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include ], + [boost::crc_32_type crc;])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + lyx_cv_with_included_boost=yes + ]) + AC_LANG_POP(C++) + fi if test x$lyx_cv_with_included_boost = xyes ; then lyx_included_libs="$lyx_included_libs boost" BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost' - if test $lyx_std_regex = yes ; then - BOOST_LIBS="" - else - BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a' - fi else BOOST_INCLUDES= - if test $lyx_std_regex = yes ; then - BOOST_LIBS="" - else - AC_LANG_PUSH(C++) - save_LIBS=$LIBS - - AC_MSG_CHECKING([for multithreaded boost libraries]) - LIBS="$save_LIBS -lboost_regex-mt $LIBTHREAD" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([#include ], - [boost::regex reg;])], - [AC_MSG_RESULT([yes]) - BOOST_MT="-mt"], - [AC_MSG_RESULT([no]) - AC_MSG_CHECKING([for plain boost libraries]) - LIBS="$save_LIBS -lboost_regex" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([#include ], - [boost::regex reg;])], - [AC_MSG_RESULT([yes]) - BOOST_MT=""], - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot find suitable boost library (do not use --without-included-boost)]) - ]) - ]) - LIBS=$save_LIBS - AC_LANG_POP(C++) - - dnl In general, system boost libraries are incompatible with - dnl the use of stdlib-debug in libstdc++. See ticket #9736 for - dnl details. - if test $enable_stdlib_debug = "yes" ; then - LYX_WARNING([Compiling LyX with stdlib-debug and system boost libraries may lead to - crashes. Consider using --disable-stdlib-debug or removing - --without-included-boost.]) - fi - - BOOST_LIBS="-lboost_regex${BOOST_MT}" - fi fi AC_SUBST(BOOST_INCLUDES) - AC_SUBST(BOOST_LIBS) ]) @@ -535,6 +498,9 @@ AC_DEFUN([LYX_USE_INCLUDED_ICONV],[ if test x$lyx_cv_with_included_iconv = xyes ; then lyx_included_libs="$lyx_included_libs iconv" +dnl This is hardcoded to make it compile + AC_DEFINE([HAVE_WORKING_O_NOFOLLOW], 0, [Define to 1 if O_NOFOLLOW works.]) + dnl Some bits from libiconv configure.ac to avoid a nested configure call: AC_EILSEQ AC_TYPE_MBSTATE_T @@ -973,3 +939,29 @@ AC_DEFUN([LYX_SET_VERSION_INFO], AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver") ]) +AC_DEFUN([LYX_CHECK_WITH_SAXON], +[ + lyx_use_saxon=true + AC_ARG_WITH(saxon, AS_HELP_STRING([--without-saxon],[do not install saxon library (epub export)])) + test "$with_saxon" = "no" && lyx_use_saxon=false + + if $lyx_use_saxon ; then + AC_MSG_RESULT(Set to installing internal saxon.) + fi + + AM_CONDITIONAL(SAXON_INSTALL, $lyx_use_saxon) + ]) + +AC_DEFUN([LYX_CHECK_WITH_XSLT_SHEETS], +[ + lyx_use_xslt_stylesheets=true + AC_ARG_WITH(xslt-stylesheets, AS_HELP_STRING([--without-xslt-stylesheets],[do not install XSLT Stylesheets (epub export)])) + test "$with_xslt_stylesheets" = "no" && lyx_use_xslt_stylesheets=false + + if $lyx_use_xslt_stylesheets ; then + AC_MSG_RESULT(Set to installing XSLT Stylesheets.) + fi + + AM_CONDITIONAL(XSLT_SHEETS_INSTALL, $lyx_use_xslt_stylesheets) + ]) +