Add automake support for dtl

[features.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index a6298accf0e1d19f583893fe260198312e5e4b8e..5ba1984ca63ad556377ee8a349d9aeb14774ab4b 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,8 +408,12 @@ 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"
-  fi
+      case $gxx_version in
+         9.*) AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
+              AM_CXXFLAGS="$AM_CXXFLAGS  -Wno-deprecated-copy";;
+         *) AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra";;
+      esac
+    fi
   case $gxx_version in
       2.*|3.*|4.@<:@0-6@:>@) AC_MSG_ERROR([gcc >= 4.7 is required]);;
   esac
@@ -599,6 +607,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],
@@ -874,7 +897,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...)
@@ -894,7 +917,7 @@ 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)