])
-dnl Check whether to configure for Qt4 or Qt5. Default is Qt5.
+dnl Check whether to configure for Qt5, or Qt6. 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])
+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
)
AC_ARG_ENABLE(stdlib-debug,
- 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])]
+ AS_HELP_STRING([--enable-stdlib-debug],[enable debug mode in libstdc++]),,
+ [enable_stdlib_debug=no]
+)
+
+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
CXX_VERSION="($clang_version)"
fi
+ case $gxx_version in
+ 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"
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
+ 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([-Wno-deprecated-copy],
+ AX_CHECK_COMPILE_FLAG([-Wdeprecated-copy],
[AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-copy"], [], [-Werror])
AC_LANG_POP(C++)
fi
- case $gxx_version in
- 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
enable_stdlib_debug=no
fi
fi
+ 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
fi
# Some additional flags may be needed
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
])
])
+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 Usage: LYX_WITH_DIR(dir-name,desc,dir-var-name,default-value,
dnl [default-yes-value])
dnl Adds a --with-'dir-name' option (described by 'desc') and puts the
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)
+ ])
+
projects / lyx.git / blobdiff