X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=a3f89a5ef412eb94ff8d8af2eb0b942d0c015085;hb=833863c47762a1370df52c5f74c8d111fd81fd8a;hp=ead704b1665f17da4f7a3384aa3cb8bae184188c;hpb=9fe8190364d27a538efa3928d2166b09e1cef2d5;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index ead704b166..a3f89a5ef4 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -19,14 +19,14 @@ AC_MSG_CHECKING([for build type]) lyx_devel_version=no lyx_prerelease=no AC_ARG_ENABLE(build-type, - AC_HELP_STRING([--enable-build-type=STR],[set build type to rel(ease), pre(release), dev(elopment), prof(iling), or gprof (default: LYX_BUILD_TYPE)]), + AS_HELP_STRING([--enable-build-type=STR],[set build type to rel(ease), pre(release), dev(elopment), prof(iling), or gprof (default: LYX_BUILD_TYPE)]), [case $enableval in dev*) build_type=development;; pre*) build_type=prerelease;; prof*) build_type=profiling;; gprof*) build_type=gprof;; rel*) build_type=release;; - *) AC_MSG_ERROR([bad build type specification \"$enableval\". Please use one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);; + *) AC_MSG_ERROR([bad build type specification '$enableval'. Please use one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);; esac], [build_type=LYX_BUILD_TYPE]) AC_MSG_RESULT([$build_type]) @@ -49,7 +49,7 @@ AC_MSG_CHECKING([for version suffix]) dnl We need the literal double quotes in the rpm spec file RPM_VERSION_SUFFIX='""' AC_ARG_WITH(version-suffix, - [AC_HELP_STRING([--with-version-suffix@<:@=STR@:>@], install lyx files as lyxSTR (default STR: -AC_PACKAGE_VERSION))], + [AS_HELP_STRING([--with-version-suffix@<:@=STR@:>@], install lyx files as lyxSTR (default STR: -AC_PACKAGE_VERSION))], [if test "x$withval" = "xyes"; then withval="-"AC_PACKAGE_VERSION @@ -63,14 +63,27 @@ AC_MSG_RESULT([$withval]) ]) -dnl Check whether to configure for Qt5. Default is Qt4. +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 requested]) +AC_MSG_CHECKING([whether Qt5 is disabled]) AC_ARG_ENABLE([qt5], - [ --enable-qt5 use Qt5 for building], - USE_QT5=$enableval, USE_QT5=no) -AC_MSG_RESULT([$USE_QT5]) + [AS_HELP_STRING([--disable-qt5],[do not use Qt5 for building])], + USE_QT5=$enableval, USE_QT5=yes) +if test x$USE_QT5 != xno ; then + AC_MSG_RESULT([no]) +else + AC_MSG_RESULT([yes]) +fi AC_SUBST([USE_QT5]) ]) @@ -138,12 +151,11 @@ dnl Usage: LYX_PROG_CLANG: set CLANG to yes if the compiler is clang. AC_DEFUN([LYX_PROG_CLANG], [AC_CACHE_CHECK([whether the compiler is clang], [lyx_cv_prog_clang], -[AC_TRY_COMPILE([], [ +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ #ifndef __clang__ this is not clang #endif -], -[lyx_cv_prog_clang=yes ; CLANG=yes], [lyx_cv_prog_clang=no ; CLANG=no])]) +]])],[lyx_cv_prog_clang=yes ; CLANG=yes],[lyx_cv_prog_clang=no ; CLANG=no])]) if test $CLANG = yes ; then AC_CACHE_CHECK([for clang version], [lyx_cv_clang_version], @@ -161,18 +173,22 @@ fi ]) -dnl Usage: LYX_CXX_CXX11_FLAGS: add to AM_CXXFLAGS the best flag that -selects C++11 mode; gives an error when C++11 mode is not found. +dnl Usage: LYX_CXX_CXX11_FLAGS(VERSION): add to AM_CXXFLAGS the best flag that +dnl selects C++11 mode; gives an error when C++11 mode is not found. +dnl VERSION is a list of years to try (e.g. 11 or {14,11}). AC_DEFUN([LYX_CXX_CXX11_FLAGS], -[AC_CACHE_CHECK([for at least C++11 mode], [lyx_cv_cxx11_flags], +[AC_CACHE_CHECK([for a good C++ mode], [lyx_cv_cxx11_flags], [lyx_cv_cxx11_flags=none - for flag in -std=c++14 -std=c++11 "" -std=c++0x -std=gnu++14 -std=gnu++11 -std=gnu++0x ; do + for flag in `eval echo -std=c++$1 default -std=gnu++$1` ; do + if test $flag = default ; then + flag= + fi save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$flag $AM_CXXFLAGS $CXXFLAGS" dnl sample openmp source code to test - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ template struct check { @@ -195,59 +211,17 @@ AC_DEFUN([LYX_CXX_CXX11_FLAGS], check_type c; check_type&& cr = static_cast(c); - auto d = a;], [], - [lyx_cv_cxx11_flags=$flag; break]) + auto d = a;]], [[]])],[lyx_cv_cxx11_flags=$flag; break],[]) CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS done]) - if test $lyx_cv_cxx11_flags = none ; then - AC_ERROR([Cannot find suitable C++11 mode for compiler $CXX]) + if test x$lyx_cv_cxx11_flags = xnone ; then + AC_MSG_ERROR([Cannot find suitable mode for compiler $CXX]) fi AM_CXXFLAGS="$lyx_cv_cxx11_flags $AM_CXXFLAGS" ]) -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, - AC_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_TRY_LINK( - [ - #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. @@ -257,13 +231,12 @@ AC_DEFUN([LYX_CXX_USE_CALL_ONCE], CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include static std::once_flag flag; - ], [ + ]], [[ std::call_once(flag, [](){ return; }); - ], [lyx_std_call_once=yes], [lyx_std_call_once=no]) + ]])],[lyx_std_call_once=yes],[lyx_std_call_once=no]) CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS AC_MSG_RESULT([$lyx_std_call_once]) @@ -279,12 +252,11 @@ dnl Usage: LYX_LIB_STDCXX: set lyx_cv_lib_stdcxx to yes if the STL library is li AC_DEFUN([LYX_LIB_STDCXX], [AC_CACHE_CHECK([whether STL is libstdc++], [lyx_cv_lib_stdcxx], -[AC_TRY_COMPILE([#include], [ +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include]], [[ #if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__) this is not libstdc++ #endif -], -[lyx_cv_lib_stdcxx=yes], [lyx_cv_lib_stdcxx=no])]) +]])],[lyx_cv_lib_stdcxx=yes],[lyx_cv_lib_stdcxx=no])]) ]) @@ -293,12 +265,11 @@ dnl if the STL library is GNU libstdc++ and the C++11 ABI is used. AC_DEFUN([LYX_LIB_STDCXX_CXX11_ABI], [AC_CACHE_CHECK([whether STL is libstdc++ using the C++11 ABI], [lyx_cv_lib_stdcxx_cxx11_abi], -[AC_TRY_COMPILE([#include], [ +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include]], [[ #if ! defined(_GLIBCXX_USE_CXX11_ABI) || ! _GLIBCXX_USE_CXX11_ABI this is not libstdc++ using the C++11 ABI #endif -], -[lyx_cv_lib_stdcxx_cxx11_abi=yes], [lyx_cv_lib_stdcxx_cxx11_abi=no])]) +]])],[lyx_cv_lib_stdcxx_cxx11_abi=yes],[lyx_cv_lib_stdcxx_cxx11_abi=no])]) ]) @@ -306,12 +277,17 @@ AC_DEFUN([LYX_PROG_CXX], [AC_REQUIRE([AC_PROG_CXX]) 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: 17, 14, then 11)]),, + [enable_cxx_mode={17,14,11}] +) + AC_LANG_PUSH(C++) LYX_PROG_CLANG -LYX_CXX_CXX11_FLAGS +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++) @@ -329,8 +305,8 @@ fi ### We might want to get or shut warnings. AC_ARG_ENABLE(warnings, - AC_HELP_STRING([--enable-warnings],[tell the compiler to display more warnings]),, - [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $ac_cv_prog_gxx = yes ; then + AS_HELP_STRING([--enable-warnings],[tell the compiler to display more warnings]),, + [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $GXX = yes ; then enable_warnings=yes; else enable_warnings=no; @@ -341,19 +317,19 @@ fi ### We might want to disable debug AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug],[enable debug information]),, + AS_HELP_STRING([--enable-debug],[enable debug information]),, [AS_CASE([$build_type], [rel*], [enable_debug=no], [enable_debug=yes])] ) AC_ARG_ENABLE(stdlib-debug, - AC_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),, + AS_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),, [AS_CASE([$build_type], [dev*], [enable_stdlib_debug=yes], [enable_stdlib_debug=no])] ) ### set up optimization AC_ARG_ENABLE(optimization, - AC_HELP_STRING([--enable-optimization@<:@=ARG@:>@],[enable compiler optimisation]),, + AS_HELP_STRING([--enable-optimization@<:@=ARG@:>@],[enable compiler optimisation]),, enable_optimization=yes;) case $enable_optimization in yes) @@ -367,7 +343,7 @@ case $enable_optimization in esac AC_ARG_ENABLE(assertions, - AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, + AS_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, [AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes], [enable_assertions=no])] ) @@ -383,6 +359,10 @@ if test x$GXX = xyes; then if test x$CLANG = xno; then dnl Useful for global version info gxx_version=`${CXX} -dumpversion` + case $gxx_version in + *.*) ;; + *) gxx_version=`${CXX} -dumpfullversion` ;; + esac CXX_VERSION="($gxx_version)" else gxx_version=clang-$clang_version @@ -401,27 +381,33 @@ 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 if test x$enable_warnings = xyes ; then AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra" - fi + dnl Shut off warning -Wdeprecated-copy, which triggers too much + dnl note that g++ always accepts -Wno-xxx, even when -Wxxx is an error. + AC_LANG_PUSH(C++) + AX_CHECK_COMPILE_FLAG([-Wno-deprecated-copy], + [AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-copy"], [], [-Werror]) + AC_LANG_POP(C++) + fi case $gxx_version in - 2.*|3.*) AC_ERROR([gcc >= 4.6 is required]);; - 4.0*|4.1*|4.2*|4.3*|4.4*|4.5*) AC_ERROR([gcc >= 4.6 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 dnl See http://clang-developers.42468.n3.nabble.com/libc-debug-mode-td3336742.html - case $gxx_version in - *) + if test x$lyx_cv_lib_stdcxx = xyes ; then lyx_flags="$lyx_flags stdlib-debug" AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode]) AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode]) - ;; - esac + AC_SUBST(STDLIB_DEBUG, "-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC") + else + enable_stdlib_debug=no + fi fi fi @@ -439,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, - [AC_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) ]) @@ -509,7 +490,7 @@ dnl be used. AC_DEFUN([LYX_USE_INCLUDED_ICONV],[ AC_MSG_CHECKING([whether to use included iconv library]) AC_ARG_WITH(included-iconv, - [AC_HELP_STRING([--with-included-iconv], [use the iconv lib supplied with LyX instead of the system one])], + [AS_HELP_STRING([--with-included-iconv], [use the iconv lib supplied with LyX instead of the system one])], [lyx_cv_with_included_iconv=$withval], [lyx_cv_with_included_iconv=no]) AM_CONDITIONAL(USE_INCLUDED_ICONV, test x$lyx_cv_with_included_iconv = xyes) @@ -517,11 +498,14 @@ 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 AC_CHECK_FUNCS([getc_unlocked mbrtowc wcrtomb mbsinit setlocale]) -dnl Ymbstate_t is used if HAVE_WCRTOMB || HAVE_MBRTOWC, see 3rdparty/libiconv/1.14/lib/loop_wchar.h. +dnl Ymbstate_t is used if HAVE_WCRTOMB || HAVE_MBRTOWC, see 3rdparty/libiconv/1.15/lib/loop_wchar.h. if test $ac_cv_func_wcrtomb = yes || test $ac_cv_func_mbrtowc = yes; then USE_MBSTATE_T=1 else @@ -551,9 +535,9 @@ dnl we want const correctness dnl we build a static lib DLL_VARIABLE= AC_SUBST([DLL_VARIABLE]) - ICONV_INCLUDES='-I$(top_srcdir)/3rdparty/libiconv/1.14 -I$(top_builddir)/3rdparty/libiconv' + ICONV_INCLUDES='-I$(top_srcdir)/3rdparty/libiconv/1.15 -I$(top_builddir)/3rdparty/libiconv' ICONV_LIBS='\$(top_builddir)/3rdparty/libiconv/liblyxiconv.a' - ICONV_ICONV_H_IN=3rdparty/libiconv/iconv.h:3rdparty/libiconv/1.14/include/iconv.h.in + ICONV_ICONV_H_IN=3rdparty/libiconv/iconv.h:3rdparty/libiconv/1.15/include/iconv.h.in else ICONV_INCLUDES= AM_ICONV @@ -575,7 +559,7 @@ dnl be used. AC_DEFUN([LYX_USE_INCLUDED_ZLIB],[ AC_MSG_CHECKING([whether to use included zlib library]) AC_ARG_WITH(included-zlib, - [AC_HELP_STRING([--with-included-zlib], [use the zlib lib supplied with LyX instead of the system one])], + [AS_HELP_STRING([--with-included-zlib], [use the zlib lib supplied with LyX instead of the system one])], [lyx_cv_with_included_zlib=$withval], [lyx_cv_with_included_zlib=no]) AM_CONDITIONAL(USE_INCLUDED_ZLIB, test x$lyx_cv_with_included_zlib = xyes) @@ -601,25 +585,47 @@ dnl prevent clash with system zlib that might be dragged in by other libs ]) +dnl Usage: LYX_BUILD_INCLUDED_DTL : select if the included dtl should +dnl be built and installed. +AC_DEFUN([LYX_BUILD_INCLUDED_DTL],[ + AC_MSG_CHECKING([whether to build dv2dt and dt2dv]) + AC_ARG_WITH(included-dtl, + [AS_HELP_STRING([--with-included-dtl], [build and install the dv2dt and dt2dv programs supplied with LyX])], + [lyx_cv_with_included_dtl=$withval], + [lyx_cv_with_included_dtl=no]) + AM_CONDITIONAL(BUILD_INCLUDED_DTL, test x$lyx_cv_with_included_dtl = xyes) + AC_MSG_RESULT([$lyx_cv_with_included_dtl]) + if test x$lyx_cv_with_included_dtl = xyes ; then + lyx_flags="$lyx_flags build-dtl" + fi]) + + dnl Usage: LYX_CHECK_CALLSTACK_PRINTING: define LYX_CALLSTACK_PRINTING if the dnl necessary APIs are available to print callstacks. AC_DEFUN([LYX_CHECK_CALLSTACK_PRINTING], -[AC_CACHE_CHECK([whether printing callstack is possible], - [lyx_cv_callstack_printing], -[AC_TRY_COMPILE([ -#include -#include -], [ - void* array[200]; - size_t size = backtrace(array, 200); - backtrace_symbols(array, size); - int status = 0; - abi::__cxa_demangle("abcd", 0, 0, &status); -], -[lyx_cv_callstack_printing=yes], [lyx_cv_callstack_printing=no])]) +[AC_ARG_ENABLE([callstack-printing], + [AS_HELP_STRING([--disable-callstack-printing],[do not print a callstack when crashing])], + lyx_cv_callstack_printing=$enableval, lyx_cv_callstack_printing=yes) + +if test x"$lyx_cv_callstack_printing" = xyes; then + AC_CACHE_CHECK([whether printing callstack is possible], + [lyx_cv_callstack_printing], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + ]], [[ + void* array[200]; + size_t size = backtrace(array, 200); + backtrace_symbols(array, size); + int status = 0; + abi::__cxa_demangle("abcd", 0, 0, &status); + ]])],[],[lyx_cv_callstack_printing=no])]) +fi if test x"$lyx_cv_callstack_printing" = xyes; then AC_DEFINE([LYX_CALLSTACK_PRINTING], 1, [Define if callstack can be printed]) + lyx_flags="$lyx_flags callback-printing" + AM_LDFLAGS="${AM_LDFLAGS} -rdynamic" fi ]) @@ -628,7 +634,7 @@ dnl Usage: LYX_USE_INCLUDED_MYTHES : select if the included MyThes should dnl be used. AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[ AC_ARG_WITH(included-mythes, - [AC_HELP_STRING([--with-included-mythes], [force to use the MyThes lib supplied with LyX])], + [AS_HELP_STRING([--with-included-mythes], [force to use the MyThes lib supplied with LyX])], [use_included_mythes=$withval], [use_included_mythes=no]) if test x$use_included_mythes != xyes ; then @@ -673,7 +679,7 @@ dnl [default-yes-value]) dnl Adds a --with-'dir-name' option (described by 'desc') and puts the dnl resulting directory name in 'dir-var-name'. AC_DEFUN([LYX_WITH_DIR],[ - AC_ARG_WITH($1,[AC_HELP_STRING([--with-$1],[specify $2])]) + AC_ARG_WITH($1,[AS_HELP_STRING([--with-$1],[specify $2])]) AC_MSG_CHECKING([for $2]) if test -z "$with_$3"; then AC_CACHE_VAL(lyx_cv_$3, lyx_cv_$3=$4) @@ -692,7 +698,7 @@ AC_DEFUN([LYX_LOOP_DIR],[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for dir in `eval "echo $1"`; do if test ! "$dir" = NONE; then - test ! -d "$dir" && AC_MSG_ERROR([\"$dir\" is not a directory]) + test ! -d "$dir" && AC_MSG_ERROR(['$dir' is not a directory]) $2 fi done @@ -706,7 +712,7 @@ AC_DEFUN([LYX_ADD_LIB_DIR],[ $1="${$1} -L$2" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then - if test $ac_cv_prog_gxx = yes ; then + if test $GXX = yes ; then $1="${$1} -Wl[,]-R$2" else $1="${$1} -R$2" @@ -756,7 +762,7 @@ rm -f conftest*]) AC_DEFUN([LYX_USE_PACKAGING], [AC_MSG_CHECKING([what packaging should be used]) AC_ARG_WITH(packaging, - [AC_HELP_STRING([--with-packaging=STR], [set packaging for installation among: + [AS_HELP_STRING([--with-packaging=STR], [set packaging for installation among: posix, windows, macosx, haiku (default is autodetected)])], [lyx_use_packaging="$withval"], [ case $host in @@ -829,13 +835,12 @@ AC_DEFUN([AC_FUNC_MKDIR], [AC_CHECK_FUNCS([mkdir _mkdir]) AC_CACHE_CHECK([whether mkdir takes one argument], [ac_cv_mkdir_takes_one_arg], -[AC_TRY_COMPILE([ +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #if HAVE_UNISTD_H # include #endif -], [mkdir (".");], -[ac_cv_mkdir_takes_one_arg=yes], [ac_cv_mkdir_takes_one_arg=no])]) +]], [[mkdir (".");]])],[ac_cv_mkdir_takes_one_arg=yes],[ac_cv_mkdir_takes_one_arg=no])]) if test x"$ac_cv_mkdir_takes_one_arg" = xyes; then AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, [Define if mkdir takes only one argument.]) @@ -870,7 +875,7 @@ AC_DEFUN([MSYS_AC_CANONICAL_PATH], dnl this is used by the macro blow to general a proper config.h.in entry m4_define([LYX_AH_CHECK_DECL], [AH_TEMPLATE(AS_TR_CPP(HAVE_DECL_$1), - [Define if you have the prototype for function `$1'])]) + [Define if you have the prototype for function `$1'])])dnl` dnl Check things are declared in headers to avoid errors or warnings. dnl Called like LYX_CHECK_DECL(function, header1 header2...) @@ -890,7 +895,7 @@ done]) dnl this is used by the macro below to generate a proper config.h.in entry m4_define([LYX_AH_CHECK_DEF], [AH_TEMPLATE(AS_TR_CPP(HAVE_DEF_$1), - [Define to 1 if `$1' is defined in `$2'])]) + [Define to 1 if `$1' is defined in `$2'])])dnl' dnl Check whether name is defined in header by using it in codesnippet. dnl Called like LYX_CHECK_DEF(name, header, codesnippet) @@ -903,9 +908,7 @@ AC_DEFUN([LYX_CHECK_DEF], save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" AC_LANG_PUSH(C++) - AC_TRY_COMPILE([#include <$2>], [$3], - lyx_have_def_name=yes, - lyx_have_def_name=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <$2>]], [[$3]])],[lyx_have_def_name=yes],[lyx_have_def_name=no]) AC_LANG_POP(C++) CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS @@ -936,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) + ]) +