X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=e6cab08e3baa054548b361c16b3940c3e4199cb7;hb=047004cb0fca7247a6e13dde9f22c9a56ab245e6;hp=b7abe0db64d1379ecbfe3c1fbaed647d0feb1266;hpb=901356fd58f89561f9ba32cdacebc4026f66ca9b;p=features.git

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index b7abe0db64..e6cab08e3b 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -390,7 +390,7 @@ if test x$GXX = xyes; then
       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
@@ -674,6 +674,34 @@ AC_DEFUN([LYX_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 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
@@ -952,3 +980,16 @@ AC_DEFUN([LYX_CHECK_WITH_SAXON],
 	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)
+    ])
+