introduce LSMinimumSystemVersion for Mac package with automatic Qt-version based...

[features.git] / config / lyxinclude.m4

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 5d6bb1da86ae0e42d4c6d2de7d8678c3faec64fd..e4acd7b9ec089f818d26483c197157b6c76f7b87 100644 (file)
--- 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,31 @@ 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
+    6.*)
+      macos_deployment_target="10.14"
+      ;;
+    esac
+  fi
+  AM_CXXFLAGS="-mmacosx-version-min=$macos_deployment_target $AM_CXXFLAGS"
+  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
@@ -939,3 +964,29 @@ AC_DEFUN([LYX_SET_VERSION_INFO],
  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)
+    ])
+