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 variable "build_type"
lyx_devel_version=no
lyx_prerelease=no
AC_ARG_ENABLE(build-type,
- AC_HELP_STRING([--enable-build-type=TYPE],[set build setting according to TYPE=rel(ease), pre(release), dev(elopment), prof(iling), gprof]),
+ 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],
- [case AC_PACKAGE_VERSION in
- *dev*) build_type=development;;
- *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;;
- *) build_type=release ;;
- esac])
+ [build_type=LYX_BUILD_TYPE])
AC_MSG_RESULT([$build_type])
lyx_flags="$lyx_flags build=$build_type"
case $build_type in
development) lyx_devel_version=yes
- AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
LYX_DATE="not released yet" ;;
prerelease) lyx_prerelease=yes ;;
esac
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
])
-dnl Check whether to configure for Qt5. Default is Qt4.
+dnl Check whether to configure for Qt5, or Qt6. Default is Qt5.
dnl
-AC_DEFUN([LYX_CHECK_QT5],[
-AC_MSG_CHECKING([whether Qt5 is requested])
-AC_ARG_ENABLE([qt5],
- [ --enable-qt5 use Qt5 for building],
- USE_QT5=$enableval, USE_QT5=no)
-AC_MSG_RESULT([$USE_QT5])
-AC_SUBST([USE_QT5])
+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
dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the
dnl Usage: LYX_CHECK_WARNINGS Displays a warning message if a LYX_WARNING
-dnl has occured previously.
+dnl has occurred previously.
AC_DEFUN([LYX_CHECK_WARNINGS],[
if test x$lyx_warning = xyes; then
cat <<EOF
])dnl
-AC_DEFUN([LYX_PROG_CXX_WORKS],
-[rm -f conftest.C
-cat >conftest.C <<EOF
-class foo {
- // we require the mutable keyword
- mutable int bar;
- };
- // we require namespace support
- namespace baz {
- int bar;
- }
- int main() {
- return(0);
- }
-EOF
-$CXX -c $CXXFLAGS $CPPFLAGS conftest.C >&5 || CXX=
-rm -f conftest.C conftest.o conftest.obj || true
-])
-
-
-dnl Usage: LYX_PROG_CLANG: set lyx_cv_prog_clang to yes if the compiler is clang.
+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],
+ [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
+])
+
+
+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 a good C++ mode], [lyx_cv_cxx11_flags],
+ [lyx_cv_cxx11_flags=none
+ 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_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ template <typename T>
+ struct check
+ {
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
+ };
+
+ typedef check<check<bool>> right_angle_brackets;
+
+ class TestDeleted
+ {
+ public:
+ TestDeleted() = delete;
+ };
+
+
+ int a;
+ decltype(a) b;
+
+ typedef check<int> check_type;
+ check_type c;
+ check_type&& cr = static_cast<check_type&&>(c);
+
+ auto d = a;]], [[]])],[lyx_cv_cxx11_flags=$flag; break],[])
+ CXXFLAGS=$save_CXXFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+ done])
+ 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_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 <mutex>
+ 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)
])
AC_DEFUN([LYX_LIB_STDCXX],
[AC_CACHE_CHECK([whether STL is libstdc++],
[lyx_cv_lib_stdcxx],
-[AC_TRY_COMPILE([#include<vector>], [
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include<vector>]], [[
#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])])
])
-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_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<vector>]], [[
+#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])])
+])
-if test -z "$CXX" ; then
- AC_MSG_ERROR([Unable to find a good enough C++ compiler])
-fi
-AC_MSG_RESULT($CXX)
-AC_REQUIRE([AC_PROG_CXX])
+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($enable_cxx_mode)
LYX_LIB_STDCXX
+LYX_LIB_STDCXX_CXX11_ABI
+LYX_CXX_USE_CALL_ONCE
AC_LANG_POP(C++)
if test $lyx_cv_lib_stdcxx = "yes" ; then
- AC_DEFINE(STD_STRING_USES_COW, 1, [std::string uses copy-on-write])
+ 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++])
### 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;
### 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_CASE([$build_type], [dev*], [enable_stdlib_debug=yes],
- [enable_stdlib_debug=no])]
+ AS_HELP_STRING([--enable-stdlib-debug],[enable debug mode in libstdc++]),,
+ [enable_stdlib_debug=no]
)
-AC_ARG_ENABLE(concept-checks,
- AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),,
- [AS_CASE([$build_type], [dev*|pre*], [enable_concept_checks=yes],
- [enable_concept_checks=no])]
- if test x$USE_QT5 = xyes ; then
- enable_concept_checks=no
- fi
+AC_ARG_ENABLE(stdlib-assertions,
+ AS_HELP_STRING([--enable-stdlib-assertions],[enable assertions in libstdc++]),,
+ [AS_CASE([$build_type], [dev*], [enable_stdlib_assertions=yes],
+ [enable_stdlib_assertions=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
+ if test $enable_debug = yes ; then
+ lyx_optim=-Og
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(cxx11,
- AC_HELP_STRING([--enable-cxx11],[enable C++11 mode]),,
- enable_cxx11=no;)
-
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])]
)
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)"
- fi
-
- if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS="$ac_save_CXXFLAGS"
else
- CFLAGS="$lyx_opt"
- CXXFLAGS="$lyx_opt"
- if test x$enable_debug = xyes ; then
- CFLAGS="-g $CFLAGS"
- CXXFLAGS="-g $CXXFLAGS"
- fi
- if test $build_type = gprof ; then
- CFLAGS="-pg $CFLAGS"
- CXXFLAGS="-pg $CXXFLAGS"
- LDFLAGS="-pg $LDFLAGS"
- fi
- if test $build_type = profiling ; then
- CFLAGS="$CFLAGS -fno-omit-frame-pointer"
- CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer"
- fi
- fi
- if test "$ac_env_CPPFLAGS_set" != set; then
- if test x$USE_QT5 = xyes ; then
- AS_CASE([$host], [*mingw*|*cygwin*], [], [CPPFLAGS="-fPIC $CPPFLAGS"])
- fi
- 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
+ gxx_version=clang-$clang_version
+ CXX_VERSION="($clang_version)"
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-8@:>@*) AC_MSG_ERROR([gcc >= 4.9 is required]);;
esac
+
+ 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
+
+ AS_CASE([$host], [*mingw*|*cygwin*], [], [AM_CXXFLAGS="-fPIC $AM_CXXFLAGS"])
+
+ dnl Warnings are for preprocessor too
+ if test x$enable_warnings = xyes ; then
+ AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
+ 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([-Wdeprecated-copy],
+ [AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-copy"], [], [-Werror])
+ AC_LANG_POP(C++)
+ fi
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.*)
+ 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
- if test x$enable_concept_checks = xyes ; then
- case $gxx_version in
- 3.3*)
- lyx_flags="$lyx_flags concept-checks"
- dnl FIXME check whether this makes sense with clang/libc++
- AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
- ;;
- 3.4*|4.*)
- lyx_flags="$lyx_flags concept-checks"
- AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
- ;;
- esac
+ if test x$enable_stdlib_assertions = xyes ; then
+ if test x$lyx_cv_lib_stdcxx = xyes ; then
+ lyx_flags="$lyx_flags stdlib-assertions"
+ AC_DEFINE(_GLIBCXX_ASSERTIONS, 1, [libstdc++ assertions mode])
+ else
+ enable_stdlib_assertions=no
+ fi
fi
- if test x$enable_cxx11 = xyes ; then
- dnl FIXME: check what to do with clang (is anything needed at all?)
- case $gxx_version in
- 4.3*|4.4*|4.5*|4.6*)
- lyx_flags="$lyx_flags c++11-mode"
- CXXFLAGS="-std=gnu++0x $CXXFLAGS"
- ;;
- 4.7*|4.8*|4.9*)
- lyx_flags="$lyx_flags c++11-mode"
- CXXFLAGS="-std=gnu++11 $CXXFLAGS"
- ;;
- esac
- lyx_std_regex=no
- if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then
- dnl <regex> in gcc is unusable in versions less than 4.9.0
- dnl see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
- case $gxx_version in
- 4.9*)
- lyx_flags="$lyx_flags stdregex"
- lyx_std_regex=yes
- ;;
- esac
- else
- lyx_flags="$lyx_flags stdregex"
- lyx_std_regex=yes
- fi
+fi
- if test $lyx_std_regex = yes ; then
- 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)
- fi
+# Some additional flags may be needed
+if test x$GXX = xyes; then
+ case $gxx_version in
+ 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";;
+ esac
fi
-test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch"
-AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
-])dnl
+])
+
+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.hpp>],
+ [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 = xyes ; then
- BOOST_INCLUDES='-I$(top_srcdir)/boost'
- BOOST_LIBS='$(top_builddir)/boost/liblyxboost.a'
- else
+ if test x$lyx_cv_with_included_boost = xno ; then
AC_LANG_PUSH(C++)
- save_LIBS=$LIBS
-
- AC_MSG_CHECKING([for multithreaded boost libraries])
- LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD"
+ AC_MSG_CHECKING([for boost library])
AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([#include <boost/signal.hpp>],
- [boost::signal<void ()> s;])],
- [AC_MSG_RESULT([yes])
- BOOST_MT="-mt"],
+ [AC_LANG_PROGRAM([#include <boost/crc.hpp>],
+ [boost::crc_32_type crc;])],
+ [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
- AC_MSG_CHECKING([for plain boost libraries])
- LIBS="$save_LIBS -lboost_signals -lm"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([#include <boost/signal.hpp>],
- [boost::signal<void ()> s;])],
- [AC_MSG_RESULT([yes])
- BOOST_MT=""],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot find suitable boost library (do not use --without-included-boost)])
- ])
+ lyx_cv_with_included_boost=yes
])
- LIBS=$save_LIBS
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'
+ else
BOOST_INCLUDES=
- if test $lyx_std_regex = yes ; then
- BOOST_LIBS="-lboost_signals${BOOST_MT}"
- else
- BOOST_LIBS="-lboost_regex${BOOST_MT} -lboost_signals${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 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.15/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 <wchar.h> is standalone],
+ [gl_cv_header_wchar_h_standalone],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <wchar.h>
+ 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.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.15/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_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 <execinfo.h>
-#include <cxxabi.h>
-], [
- 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 <execinfo.h>
+ #include <cxxabi.h>
+ ]], [[
+ 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_MSG_CHECKING([whether to use included MyThes library])
- AC_ARG_WITH(included-mythes,
- [AC_HELP_STRING([--without-included-mythes], [do not use the MyThes lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])],
- [lyx_cv_with_included_mythes=$withval],
- [lyx_cv_with_included_mythes=yes])
- AM_CONDITIONAL(USE_INCLUDED_MYTHES, test x$lyx_cv_with_included_mythes = xyes)
- AC_MSG_RESULT([$lyx_cv_with_included_mythes])
- if test x$lyx_cv_with_included_mythes != xyes ; then
- AC_LANG_PUSH(C++)
- AC_CHECK_HEADER(mythes.hxx,[ac_cv_header_mythes_h=yes lyx_cv_mythes_h_location="<mythes.hxx>"])
- if test x$ac_cv_header_mythes_h != xyes; then
- AC_CHECK_HEADER(mythes/mythes.hxx,[ac_cv_header_mythes_h=yes lyx_cv_mythes_h_location="<mythes/mythes.hxx>"])
- fi
- AC_CHECK_LIB(mythes, main, [MYTHES_LIBS="-lmythes" lyx_mythes=yes], [lyx_mythes=no], [-lm])
- if test x$lyx_mythes != xyes; then
- AC_CHECK_LIB(mythes-1.2, main, [MYTHES_LIBS="-lmythes-1.2" lyx_mythes=yes], [lyx_mythes=no], [-lm])
- fi
- AC_LANG_POP(C++)
- if test x$lyx_mythes != xyes -o x$ac_cv_header_mythes_h != xyes; then
- AC_MSG_ERROR([cannot find suitable MyThes library (do not use --without-included-mythes)])
- fi
- AC_DEFINE(USE_EXTERNAL_MYTHES, 1, [Define as 1 to use an external MyThes library])
- AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx])
- AC_SUBST(MYTHES_LIBS)
- fi
+ 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 <cstdio>]
+ [#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.hxx>"
+ 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])
+])
+
+
+dnl Usage: LYX_CHECK_MACOS_DEPLOYMENT_TARGET : select the macos deployment target
+dnl [default-auto-value])
+dnl Assign the macosx-version-min value for compiler, linker and Info.plist.
+dnl Default is dynamic - depends on used Qt library version.
+AC_DEFUN([LYX_CHECK_MACOS_DEPLOYMENT_TARGET],[
+ AC_ARG_WITH(macos-deployment-target,
+ [AS_HELP_STRING([--with-macos-deployment-target], [force the macos deployment target for LyX])],
+ [macos_deployment_target=$withval],
+ [macos_deployment_target=auto])
+ if test "${macos_deployment_target}" = "auto" ; then
+ macos_deployment_target="10.10"
+ case "$QTLIB_VERSION" in
+ 5.12.*)
+ macos_deployment_target="10.12"
+ ;;
+ 6.*)
+ macos_deployment_target="10.14"
+ ;;
+ esac
+ fi
+ AM_CPPFLAGS="-mmacosx-version-min=$macos_deployment_target $AM_CPPFLAGS"
+ AM_LDFLAGS="-mmacosx-version-min=$macos_deployment_target $AM_LDFLAGS"
+ AC_SUBST(macos_deployment_target,"${macos_deployment_target}")
+ AC_MSG_CHECKING([the macos deployment target for LyX])
+ AC_MSG_RESULT([$macos_deployment_target])
])
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)
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)
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
$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"
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
pkgdatadir='${datadir}/${PACKAGE}'
default_prefix=$ac_default_prefix
case ${host} in
- *cygwin*) lyx_install_cygwin=true ;;
- *apple-darwin*) lyx_install_macosx=true ;;
+ *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)
[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 <sys/stat.h>
#if HAVE_UNISTD_H
# include <unistd.h>
#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.])
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...)
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)
AC_DEFUN([LYX_CHECK_DEF],
[LYX_AH_CHECK_DEF($1, $2)
AC_MSG_CHECKING([whether $1 is defined by header $2])
- AC_TRY_COMPILE([#include <$2>], [$3],
- lyx_have_def_name=yes,
- lyx_have_def_name=no)
+ 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))
AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver")
])
-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ---------------------------------------------------------------------------
-# Copied from autoconf 2.68, added a check that python version is < 3.0
-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
-# Run ACTION-IF-FALSE otherwise.
-# This test uses sys.hexversion instead of the string equivalent (first
-# word of sys.version), in order to cope with versions such as 2.2c1.
-# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [prog="import sys
-# split strings by '.' and convert to numeric. Append some zeros
-# because we need at least 4 digits for the hex conversion.
-# map returns an iterator in Python 3.0 and a list in 2.x
-minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
-minverhex = 0
-maxverhex = 50331648 # = 3.0.0.0
-# xrange is not present in Python 3.0 and range returns an iterator
-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
-sys.exit(sys.hexversion < minverhex or sys.hexversion >= maxverhex)"
- AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
+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)
+ ])
+
projects / lyx.git / blobdiff