Accelerators

[lyx.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index f77e3480f623d5db9fd451644f18a7d1f5a86654..369ecaefbb8e2fda55bede36284a3668b9983ea5 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -381,6 +381,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
@@ -404,9 +408,11 @@ if test x$GXX = xyes; then
   fi
   dnl Warnings are for preprocessor too
   if test x$enable_warnings = xyes ; then
+      AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
       case $gxx_version in
-         9.*) AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra -Wno-deprecated-copy";;
-         *) AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra";;
+         9.*|10.*|clang-10*)
+             AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-copy";;
+         *);;
       esac
     fi
   case $gxx_version in
@@ -602,6 +608,21 @@ 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],