X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=9fe42e884747490912f170b7145d670a4feade83;hb=a5a8c6731c27d3c7b1aa8a6384ec701aa7e5e332;hp=c742c2eb25c796ca38448959075ee181582e3f1e;hpb=4a2243135cf2b1182646de13d0a9cd0dd24f0332;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index c742c2eb25..9fe42e8847 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -3,37 +3,42 @@ dnl Author: Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr) dnl Lars Gullik Bjønnes (larsbj@lyx.org) dnl Allan Rae (rae@lyx.org) +dnl Compute the default build type from AC_PACKAGE_VERSION at autoconf time. +m4_define([LYX_BUILD_TYPE], [m4_bmatch(AC_PACKAGE_VERSION, + [dev], [development], + [pre\|alpha\|beta\|rc], [prerelease], + [release])]) + dnl Usage LYX_CHECK_VERSION Displays version of LyX being built and -dnl sets variables "lyx_devel_version" and "lyx_prerelease" +dnl sets variable "build_type" AC_DEFUN([LYX_CHECK_VERSION],[ echo "configuring LyX version" AC_PACKAGE_VERSION + +AC_MSG_CHECKING([for build type]) lyx_devel_version=no lyx_prerelease=no -build_type=release -AC_MSG_CHECKING([for build type]) AC_ARG_ENABLE(build-type, - AC_HELP_STRING([--enable-build-type=TYPE],[set build setting according to TYPE=dev(elopment), rel(ease) or pre(release)]), + 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*) lyx_devel_version=yes - build_type=development;; - pre*) lyx_prerelease=yes - build_type=prerelease;; - rel*) ;; - *) AC_ERROR([Bad build type specification \"$enableval\". Please use one of dev(elopment), rel(ease) or pre(release)]);; + 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]);; esac], - [case AC_PACKAGE_VERSION in - *svn*) lyx_devel_version=yes - build_type=development;; - *pre*|*alpha*|*beta*|*rc*) lyx_prerelease=yes - build_type=prerelease;; - esac]) + [build_type=LYX_BUILD_TYPE]) AC_MSG_RESULT([$build_type]) -if test $lyx_devel_version = yes ; then - AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX]) - LYX_DATE="not released yet" -fi -AC_SUBST(lyx_devel_version)]) +lyx_flags="$lyx_flags build=$build_type" +case $build_type in + development) lyx_devel_version=yes + LYX_DATE="not released yet" ;; + prerelease) lyx_prerelease=yes ;; +esac + +AC_SUBST(lyx_devel_version) +]) dnl Define the option to set a LyX version on installed executables and directories @@ -44,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@<:@=VERSION@:>@], install lyx files as lyxVERSION (VERSION=-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 @@ -53,17 +58,25 @@ AC_ARG_WITH(version-suffix, AC_SUBST(version_suffix,$withval) RPM_VERSION_SUFFIX="--with-version-suffix=$withval"]) AC_SUBST(RPM_VERSION_SUFFIX) +AC_SUBST(program_base_name,"lyx") AC_MSG_RESULT([$withval]) ]) -dnl Usage: LYX_ERROR(message) Displays the warning "message" and sets the -dnl flag lyx_error to yes. -AC_DEFUN([LYX_ERROR],[ -lyx_error_txt="$lyx_error_txt -** $1 -" -lyx_error=yes]) +dnl Check whether to configure for Qt4 or Qt5. Default is Qt5. +dnl +AC_DEFUN([LYX_CHECK_QT5],[ +AC_MSG_CHECKING([whether Qt5 is disabled]) +AC_ARG_ENABLE([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]) +]) dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the @@ -78,36 +91,20 @@ lyx_warning=yes]) dnl Usage: LYX_LIB_ERROR(file,library) Displays an error message indication dnl that 'file' cannot be found because 'lib' may be uncorrectly installed. AC_DEFUN([LYX_LIB_ERROR],[ -LYX_ERROR([Cannot find $1. Please check that the $2 library +AC_MSG_ERROR([cannot find $1. Please check that the $2 library is correctly installed on your system.])]) -dnl Usage: LYX_CHECK_ERRORS Displays a warning message if a LYX_ERROR -dnl has occured previously. -AC_DEFUN([LYX_CHECK_ERRORS],[ +dnl Usage: LYX_CHECK_WARNINGS Displays a warning message if a LYX_WARNING +dnl has occurred previously. +AC_DEFUN([LYX_CHECK_WARNINGS],[ if test x$lyx_warning = xyes; then cat <conftest.C <&5 || CXX= -rm -f conftest.C conftest.o conftest.obj || true +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_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])]) +if test $CLANG = yes ; then + AC_CACHE_CHECK([for clang version], + [lyx_cv_clang_version], + [clang_noversion=no + AC_COMPUTE_INT(clang_major,__clang_major__,,[clang_noversion_=yes]) + AC_COMPUTE_INT(clang_minor,__clang_minor__,,[clang_noversion_=yes]) + AC_COMPUTE_INT(clang_patchlevel,__clang_patchlevel__,,[clang_noversion_=yes]) + if test $clang_noversion = yes ; then + clang_version=unknown + else + clang_version=$clang_major.$clang_minor.$clang_patchlevel + fi + lyx_cv_clang_version=$clang_version]) +fi ]) -AC_DEFUN([LYX_PROG_CXX], -[AC_MSG_CHECKING([for a good enough C++ compiler]) -LYX_SEARCH_PROG(CXX, $CXX $CCC g++ gcc c++ CC cxx xlC cc++, [LYX_PROG_CXX_WORKS]) +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. +AC_DEFUN([LYX_CXX_CXX11_FLAGS], +[AC_CACHE_CHECK([for at least C++11 mode], [lyx_cv_cxx11_flags], + [lyx_cv_cxx11_flags=none + for flag in -std=c++14 -std=c++11 "" -std=gnu++14 -std=gnu++11 ; do + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$flag $AM_CXXFLAGS $CXXFLAGS" + dnl sample openmp source code to test + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + typedef check> right_angle_brackets; + + class TestDeleted + { + public: + TestDeleted() = delete; + }; + + + int a; + decltype(a) b; + + typedef check check_type; + check_type c; + check_type&& cr = static_cast(c); + + 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_MSG_ERROR([Cannot find suitable C++11 mode for compiler $CXX]) + fi + AM_CXXFLAGS="$lyx_cv_cxx11_flags $AM_CXXFLAGS" +]) -if test -z "$CXX" ; then - AC_MSG_ERROR([Unable to find a good enough C++ compiler]) -fi -AC_MSG_RESULT($CXX) -AC_PROG_CXX -AC_PROG_CXXCPP +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. +AC_DEFUN([LYX_CXX_USE_CALL_ONCE], +[AC_MSG_CHECKING([for std::call_once availability]) + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" + 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]) + CXXFLAGS=$save_CXXFLAGS + CPPFLAGS=$save_CPPFLAGS + AC_MSG_RESULT([$lyx_std_call_once]) + + if test $lyx_std_call_once = yes ; then + AC_DEFINE([LYX_USE_STD_CALL_ONCE], 1, [define to 1 if std::call_once is supported by the compiler]) + fi + AM_CONDITIONAL([LYX_USE_STD_CALL_ONCE], test $lyx_std_call_once = yes) +]) + + +dnl Usage: LYX_LIB_STDCXX: set lyx_cv_lib_stdcxx to yes if the STL library is libstdc++. +AC_DEFUN([LYX_LIB_STDCXX], +[AC_CACHE_CHECK([whether STL is libstdc++], + [lyx_cv_lib_stdcxx], +[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])]) +]) + + +dnl Usage: LYX_LIB_STDCXX_CXX11_ABI: set lyx_cv_lib_stdcxx_cxx11_abi to yes +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_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])]) +]) + + +AC_DEFUN([LYX_PROG_CXX], +[AC_REQUIRE([AC_PROG_CXX]) +AC_REQUIRE([AC_PROG_CXXCPP]) + +AC_LANG_PUSH(C++) +LYX_PROG_CLANG +LYX_CXX_CXX11_FLAGS +LYX_LIB_STDCXX +LYX_LIB_STDCXX_CXX11_ABI +LYX_CXX_USE_REGEX +LYX_CXX_USE_CALL_ONCE +AC_LANG_POP(C++) + +if test $lyx_cv_lib_stdcxx = "yes" ; then + if test $lyx_cv_lib_stdcxx_cxx11_abi = "yes" ; then + AC_DEFINE(USE_GLIBCXX_CXX11_ABI, 1, [use GNU libstdc++ with C++11 ABI]) + else + AC_DEFINE(STD_STRING_USES_COW, 1, [std::string uses copy-on-write]) + fi +else + if test $lyx_cv_prog_clang = "yes" ; then + AC_DEFINE(USE_LLVM_LIBCPP, 1, [use libc++ provided by llvm instead of GNU libstdc++]) + fi +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; fi;]) if test x$enable_warnings = xyes ; then - lyx_flags="warnings $lyx_flags" + lyx_flags="$lyx_flags warnings" fi ### We might want to disable debug AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug],[enable debug information]),, - [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then - enable_debug=yes; - else - enable_debug=no; - fi;]) + 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]),, - [ if test $lyx_devel_version = yes ; then - enable_stdlib_debug=yes; - else - enable_stdlib_debug=no; - fi;]) - -AC_ARG_ENABLE(concept-checks, - AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),, - [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then - enable_concept_checks=yes; - else - enable_concept_checks=no; - fi;]) - -AC_ARG_ENABLE(profiling, - AC_HELP_STRING([--enable-profiling],[enable profiling]),, - enable_profiling=no;) + 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[=value]],[enable compiler optimisation]),, + AS_HELP_STRING([--enable-optimization@<:@=ARG@:>@],[enable compiler optimisation]),, enable_optimization=yes;) case $enable_optimization in yes) if test $lyx_devel_version = yes ; then - lyx_opt=-O + lyx_optim=-O else - lyx_opt=-O2 + lyx_optim=-O2 fi;; - no) lyx_opt=;; - *) lyx_opt=${enable_optimization};; + no) lyx_optim=;; + *) lyx_optim=${enable_optimization};; esac -AC_ARG_ENABLE(pch, - AC_HELP_STRING([--enable-pch],[enable precompiled headers]),, - enable_pch=no;) -lyx_pch_comp=no - AC_ARG_ENABLE(assertions, - AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, - [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then - enable_assertions=yes; - else - enable_assertions=no; - fi;]) + AS_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, + [AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes], + [enable_assertions=no])] +) if test "x$enable_assertions" = xyes ; then - lyx_flags="assertions $lyx_flags" + lyx_flags="$lyx_flags assertions" AC_DEFINE(ENABLE_ASSERTIONS,1, [Define if you want assertions to be enabled in the code]) fi - - # set the compiler options correctly. if test x$GXX = xyes; then - dnl Useful for global version info - gxx_version=`${CXX} -dumpversion` - CXX_VERSION="($gxx_version)" - - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" + dnl clang++ pretends to be g++ 4.2.1; this is not useful + 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 - CFLAGS="$lyx_opt" - CXXFLAGS="$lyx_opt" - if test x$enable_debug = xyes ; then - CFLAGS="-g $CFLAGS" - CXXFLAGS="-g $CXXFLAGS" - fi - if test x$enable_profiling = xyes ; then - CFLAGS="-pg $CFLAGS" - CXXFLAGS="-pg $CXXFLAGS" - LDFLAGS="-pg $LDFLAGS" - fi + gxx_version=clang-$clang_version + CXX_VERSION="($clang_version)" fi - if test "$ac_env_CPPFLAGS_set" != set; then - if test x$enable_warnings = xyes ; then - case $gxx_version in - 3.1*|3.2*|3.3*) - CPPFLAGS="-W -Wall $CPPFLAGS" - ;; - *) - CPPFLAGS="-Wextra -Wall $CPPFLAGS " - ;; - esac - fi + + AM_CXXFLAGS="$lyx_optim $AM_CXXFLAGS" + if test x$enable_debug = xyes ; then + AM_CXXFLAGS="-g $AM_CXXFLAGS" fi + if test $build_type = gprof ; then + AM_CXXFLAGS="$AM_CXXFLAGS -pg" + AM_LDFLAGS="$AM_LDFLAGS -pg" + fi + if test $build_type = profiling ; then + AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer" + fi + + if test x$USE_QT5 = 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 + case $gxx_version in + 9.*) AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra -Wno-deprecated-copy";; + *) AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra";; + esac + fi case $gxx_version in - 3.1*) AM_CXXFLAGS="-finline-limit=500 ";; - 3.2*|3.3*) AM_CXXFLAGS="";; - 3.4*|4.*) - AM_CXXFLAGS="" - test $enable_pch = yes && lyx_pch_comp=yes - ;; - *) AM_CXXFLAGS="";; + 2.*|3.*|4.@<:@0-6@:>@) AC_MSG_ERROR([gcc >= 4.7 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 - 3.4*|4.*) - lyx_flags="stdlib-debug $lyx_flags" + *) + lyx_flags="$lyx_flags stdlib-debug" AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode]) AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode]) + AC_SUBST(STDLIB_DEBUG, "-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC") ;; esac fi - if test x$enable_concept_checks = xyes ; then +fi + +# Some additional flags may be needed +if test x$GXX = xyes; then case $gxx_version in - 3.3*) - lyx_flags="concept-checks $lyx_flags" - AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS, 1, [libstdc++ concept checking]) - ;; - 3.4*|4.*) - lyx_flags="concept-checks $lyx_flags" - AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking]) - ;; + clang-3.0*|clang-3.1*|clang-3.2*|clang-3.3*) + dnl boost contains pragmas that are annoying on older clang versions + AM_CPPFLAGS="-Wno-unknown-pragmas $AM_CPPFLAGS";; + clang*) + dnl the more recent versions support the deprecated-register warning, + dnl which is very annoying with Qt4.x right now. + AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";; esac - fi fi -test "$lyx_pch_comp" = yes && lyx_flags="pch $lyx_flags" -AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes) -])dnl +]) 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 boost included library]) + 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([--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])], [lyx_cv_with_included_boost=$withval], [lyx_cv_with_included_boost=yes]) 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 != xyes ; then - AC_CHECK_LIB(boost_signals, main, [lyx_boost_underscore=yes], [], [-lm]) - AC_CHECK_LIB(boost_signals-mt, main, [lyx_boost_underscore_mt=yes], [], [-lm $LIBTHREAD]) - if test x$lyx_boost_underscore_mt = xyes ; then - BOOST_MT="-mt" - else - BOOST_MT="" - if test x$lyx_boost_plain != xyes -a x$lyx_boost_underscore != xyes ; then - LYX_ERROR([No suitable boost library found (do not use --without-included-boost)]) - fi - fi - AC_SUBST(BOOST_SEP) - AC_SUBST(BOOST_MT) + 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) +]) + + +dnl Usage: LYX_USE_INCLUDED_ICONV : select if the included iconv should +dnl be used. +AC_DEFUN([LYX_USE_INCLUDED_ICONV],[ + AC_MSG_CHECKING([whether to use included iconv library]) + AC_ARG_WITH(included-iconv, + [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) + AC_MSG_RESULT([$lyx_cv_with_included_iconv]) + if test x$lyx_cv_with_included_iconv = xyes ; then + lyx_included_libs="$lyx_included_libs iconv" + +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. + if test $ac_cv_func_wcrtomb = yes || test $ac_cv_func_mbrtowc = yes; then + USE_MBSTATE_T=1 + else + USE_MBSTATE_T=0 + fi + AC_SUBST([USE_MBSTATE_T]) + AC_CACHE_CHECK([whether is standalone], + [gl_cv_header_wchar_h_standalone], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + wchar_t w;]], + [[]])], + [gl_cv_header_wchar_h_standalone=yes], + [gl_cv_header_wchar_h_standalone=no])]) + if test $gl_cv_header_wchar_h_standalone = yes; then + BROKEN_WCHAR_H=0 + else + BROKEN_WCHAR_H=1 + fi + AC_SUBST([BROKEN_WCHAR_H]) +dnl we want const correctness + AC_DEFINE_UNQUOTED([ICONV_CONST], [const], + [Define as const if the declaration of iconv() needs const.]) + ICONV_CONST=const + AC_SUBST([ICONV_CONST]) +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_LIBS='\$(top_builddir)/3rdparty/libiconv/liblyxiconv.a' + ICONV_ICONV_H_IN=3rdparty/libiconv/iconv.h:3rdparty/libiconv/1.14/include/iconv.h.in + else + ICONV_INCLUDES= + AM_ICONV + if test "$am_cv_func_iconv" = no; then + AC_MSG_ERROR([cannot find required library iconv.]) + else + ICONV_LIBS="$LIBICONV" + fi + ICONV_ICONV_H_IN= + fi + AC_SUBST(ICONV_INCLUDES) + AC_SUBST(ICONV_LIBS) + AC_SUBST(ICONV_ICONV_H_IN) +]) + + +dnl Usage: LYX_USE_INCLUDED_ZLIB : select if the included zlib should +dnl be used. +AC_DEFUN([LYX_USE_INCLUDED_ZLIB],[ + AC_MSG_CHECKING([whether to use included zlib library]) + AC_ARG_WITH(included-zlib, + [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) + AC_MSG_RESULT([$lyx_cv_with_included_zlib]) + if test x$lyx_cv_with_included_zlib = xyes ; then + lyx_included_libs="$lyx_included_libs zlib" + ZLIB_INCLUDES='-I$(top_srcdir)/3rdparty/zlib/1.2.8 -I$(top_builddir)/3rdparty/zlib' + ZLIB_LIBS='$(top_builddir)/3rdparty/zlib/liblyxzlib.a' + mkdir -p 3rdparty/zlib +dnl include standard config.h for HAVE_UNISTD_H + echo "#include <../../config.h>" > 3rdparty/zlib/zconf.h +dnl prevent clash with system zlib that might be dragged in by other libs + echo "#define Z_PREFIX 1" >> 3rdparty/zlib/zconf.h + cat "${srcdir}/3rdparty/zlib/1.2.8/zconf.h.in" >> 3rdparty/zlib/zconf.h + else + ZLIB_INCLUDES= + AC_CHECK_HEADERS(zlib.h, + [AC_CHECK_LIB(z, gzopen, [ZLIB_LIBS="-lz"], LYX_LIB_ERROR(libz,zlib))], + [LYX_LIB_ERROR(zlib.h,zlib)]) + fi + AC_SUBST(ZLIB_INCLUDES) + AC_SUBST(ZLIB_LIBS) +]) + + +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_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 +]) + + +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, + [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 + AC_LANG_PUSH(C++) + use_included_mythes=yes + AC_CHECK_HEADERS([mythes.hxx mythes/mythes.hxx], + [mythes_h_location="<$ac_header>" + save_LIBS=$LIBS + AC_MSG_CHECKING([checking for MyThes library]) + for ac_lib in mythes mythes-1.2 ; do + LIBS="-l$ac_lib $save_LIBS" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include ] + [#include $mythes_h_location], [MyThes dummy("idx","dat")])], + [MYTHES_LIBS=-l$ac_lib + AC_MSG_RESULT([$MYTHES_LIBS]) + use_included_mythes=no]) + done + if test $use_included_mythes != no ; then + AC_MSG_RESULT([not found]) + fi + break]) + AC_LANG_POP(C++) + fi + if test $use_included_mythes = yes ; then + mythes_h_location="" + MYTHES_INCLUDES='-I$(top_srcdir)/3rdparty/mythes/1.2.5/' + MYTHES_LIBS='$(top_builddir)/3rdparty/mythes/liblyxmythes.a' + lyx_included_libs="$lyx_included_libs mythes" + fi + AM_CONDITIONAL(USE_INCLUDED_MYTHES, test x$use_included_mythes = xyes) + AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$mythes_h_location,[Location of mythes.hxx]) + AC_SUBST(MYTHES_INCLUDES) + AC_SUBST(MYTHES_LIBS) + AC_MSG_CHECKING([whether to use included MyThes library]) + AC_MSG_RESULT([$use_included_mythes]) ]) @@ -349,7 +685,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) @@ -357,7 +693,8 @@ AC_DEFUN([LYX_WITH_DIR],[ test "x$with_$3" = xyes && with_$3=$5 lyx_cv_$3="$with_$3" fi - AC_MSG_RESULT($lyx_cv_$3)]) + AC_MSG_RESULT($lyx_cv_$3) +]) dnl Usage: LYX_LOOP_DIR(value,action) @@ -367,7 +704,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 @@ -381,7 +718,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" @@ -426,39 +763,23 @@ rm -f conftest*]) ]) ### end of LYX_PATH_HEADER -### Check which frontends we want to use. -### -AC_DEFUN([LYX_USE_FRONTENDS], -[AC_MSG_CHECKING([what frontend should be used for the GUI]) -AC_ARG_WITH(frontend, - [AC_HELP_STRING([--with-frontend=THIS], [use THIS frontend as main GUI: - Possible values: qt4])], - [FRONTENDS="$withval"],[FRONTENDS="qt4"]) -if test "x$FRONTENDS" = x ; then - AC_MSG_RESULT(none) - AC_ERROR("Please select a frontend using --with-frontend") -fi -AC_MSG_RESULT($FRONTENDS) -AC_SUBST(FRONTENDS) -AC_SUBST(FRONTENDS_SUBDIRS) -AC_SUBST(FRONTENDS_PROGS) -]) - - ## Check what kind of packaging should be used at install time. ## The default is autodetected. AC_DEFUN([LYX_USE_PACKAGING], [AC_MSG_CHECKING([what packaging should be used]) AC_ARG_WITH(packaging, - [AC_HELP_STRING([--with-packaging=THIS], [use THIS packaging for installation: - Possible values: posix, windows, macosx])], + [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 *-apple-darwin*) lyx_use_packaging=macosx ;; - *-pc-mingw32*) lyx_use_packaging=windows;; - *) lyx_use_packaging=posix;; + *-pc-mingw*) lyx_use_packaging=windows ;; + *-mingw32*) lyx_use_packaging=windows ;; + *haiku*) lyx_use_packaging=haiku ;; + *) lyx_use_packaging=posix ;; esac]) AC_MSG_RESULT($lyx_use_packaging) +lyx_install_posix=false lyx_install_macosx=false lyx_install_cygwin=false lyx_install_windows=false @@ -466,6 +787,7 @@ case $lyx_use_packaging in macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout]) PACKAGE=LyX${version_suffix} default_prefix="/Applications/${PACKAGE}.app" + AC_SUBST(osx_bundle_program_name,"${program_base_name}") bindir='${prefix}/Contents/MacOS' libdir='${prefix}/Contents/Resources' datarootdir='${prefix}/Contents/Resources' @@ -487,16 +809,22 @@ case $lyx_use_packaging in pkgdatadir='${datadir}/${PACKAGE}' default_prefix=$ac_default_prefix case ${host} in - *cygwin*) lyx_install_cygwin=true ;; - esac ;; - *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;; + *cygwin*) lyx_install_cygwin=true ;; + *apple-darwin*) lyx_install_macosx=true ;; + esac + lyx_install_posix=true ;; + haiku) AC_DEFINE(USE_HAIKU_PACKAGING, 1, [Define to 1 if LyX should use a Haiku-style file layout]) + PACKAGE=lyx${version_suffix} + program_suffix=$version_suffix + pkgdatadir='${datadir}/${PACKAGE}' + default_prefix=$ac_default_prefix + lyx_install_posix=true ;; + *) AC_MSG_ERROR([unknown packaging type $lyx_use_packaging.]) ;; esac AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx) -AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin) AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows) -dnl Next two lines are only for autoconf <= 2.59 -datadir='${datarootdir}' -AC_SUBST(datarootdir) +AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin) +AM_CONDITIONAL(INSTALL_POSIX, $lyx_install_posix) AC_SUBST(pkgdatadir) AC_SUBST(program_suffix) ]) @@ -513,13 +841,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.]) @@ -554,7 +881,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...) @@ -574,17 +901,23 @@ 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) dnl Defines HAVE_DEF_{NAME} AC_DEFUN([LYX_CHECK_DEF], [LYX_AH_CHECK_DEF($1, $2) - AC_MSG_CHECKING([if $1 is defined by header $2]) - AC_TRY_COMPILE([#include <$2>], [$3], - lyx_have_def_name=yes, - lyx_have_def_name=no) + AC_MSG_CHECKING([whether $1 is defined by header $2]) + save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" + AC_LANG_PUSH(C++) + 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 AC_MSG_RESULT($lyx_have_def_name) if test "x$lyx_have_def_name" = xyes; then AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_DEF_$1)) @@ -611,3 +944,4 @@ AC_DEFUN([LYX_SET_VERSION_INFO], AC_SUBST(LYX_DIR_VER,"$lyx_dir_ver") AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver") ]) +