])
-dnl Check whether to configure for Qt4, Qt5, or Qt6. Default is Qt5.
+dnl Check whether to configure for Qt5, or Qt6. Default is Qt5.
dnl
AC_DEFUN([LYX_CHECK_QT6],[
AC_MSG_CHECKING([whether Qt6 is requested])
AC_SUBST([USE_QT6])
])
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
)
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
enable_optimization=yes;)
case $enable_optimization in
yes)
- if test $lyx_devel_version = yes ; then
- lyx_optim=-O
+ if test $enable_debug = yes ; then
+ lyx_optim=-Og
else
lyx_optim=-O2
fi;;
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 -o x$USE_QT6 = 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"
[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
])
;;
esac
fi
- AM_CXXFLAGS="-mmacosx-version-min=$macos_deployment_target $AM_CXXFLAGS"
+ 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])