]> git.lyx.org Git - lyx.git/blobdiff - config/lyxinclude.m4
Make "devel mode" configurable at run time
[lyx.git] / config / lyxinclude.m4
index ba5344a342c18c3488af53a57d5f2131894430f2..ead704b1665f17da4f7a3384aa3cb8bae184188c 100644 (file)
@@ -3,6 +3,12 @@ dnl Author: Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
 dnl         Lars Gullik Bjønnes (larsbj@lyx.org)
 dnl         Allan Rae (rae@lyx.org)
 
+dnl Compute the default build type from AC_PACKAGE_VERSION at autoconf time.
+m4_define([LYX_BUILD_TYPE], [m4_bmatch(AC_PACKAGE_VERSION,
+    [dev], [development],
+    [pre\|alpha\|beta\|rc], [prerelease],
+    [release])])
+
 
 dnl Usage LYX_CHECK_VERSION   Displays version of LyX being built and
 dnl sets variable "build_type"
@@ -13,7 +19,7 @@ AC_MSG_CHECKING([for build type])
 lyx_devel_version=no
 lyx_prerelease=no
 AC_ARG_ENABLE(build-type,
-  AC_HELP_STRING([--enable-build-type=TYPE],[set build setting according to TYPE=rel(ease), pre(release), dev(elopment), prof(iling), gprof]),
+  AC_HELP_STRING([--enable-build-type=STR],[set build type to rel(ease), pre(release), dev(elopment), prof(iling), or gprof (default: LYX_BUILD_TYPE)]),
   [case $enableval in
     dev*) build_type=development;;
     pre*) build_type=prerelease;;
@@ -22,16 +28,11 @@ AC_ARG_ENABLE(build-type,
     rel*) build_type=release;;
     *) AC_MSG_ERROR([bad build type specification \"$enableval\". Please use one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);;
    esac],
-  [case AC_PACKAGE_VERSION in
-    *dev*) build_type=development;;
-    *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;;
-    *) build_type=release ;;
-   esac])
+  [build_type=LYX_BUILD_TYPE])
 AC_MSG_RESULT([$build_type])
 lyx_flags="$lyx_flags build=$build_type"
 case $build_type in
     development) lyx_devel_version=yes
-                 AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
                 LYX_DATE="not released yet" ;;
     prerelease) lyx_prerelease=yes ;;
 esac
@@ -48,7 +49,7 @@ AC_MSG_CHECKING([for version suffix])
 dnl We need the literal double quotes in the rpm spec file
 RPM_VERSION_SUFFIX='""'
 AC_ARG_WITH(version-suffix,
-  [AC_HELP_STRING([--with-version-suffix@<:@=VERSION@:>@], install lyx files as lyxVERSION (VERSION=-AC_PACKAGE_VERSION))],
+  [AC_HELP_STRING([--with-version-suffix@<:@=STR@:>@], install lyx files as lyxSTR (default STR: -AC_PACKAGE_VERSION))],
   [if test "x$withval" = "xyes";
    then
      withval="-"AC_PACKAGE_VERSION
@@ -133,7 +134,7 @@ done
 ])dnl
 
 
-dnl Usage: LYX_PROG_CLANG: set lyx_cv_prog_clang to yes if the compiler is clang.
+dnl Usage: LYX_PROG_CLANG: set CLANG to yes if the compiler is clang.
 AC_DEFUN([LYX_PROG_CLANG],
 [AC_CACHE_CHECK([whether the compiler is clang],
                [lyx_cv_prog_clang],
@@ -143,6 +144,134 @@ AC_DEFUN([LYX_PROG_CLANG],
 #endif
 ],
 [lyx_cv_prog_clang=yes ; CLANG=yes], [lyx_cv_prog_clang=no ; CLANG=no])])
+if test $CLANG = yes ; then
+  AC_CACHE_CHECK([for clang version],
+    [lyx_cv_clang_version],
+    [clang_noversion=no
+     AC_COMPUTE_INT(clang_major,__clang_major__,,[clang_noversion_=yes])
+     AC_COMPUTE_INT(clang_minor,__clang_minor__,,[clang_noversion_=yes])
+     AC_COMPUTE_INT(clang_patchlevel,__clang_patchlevel__,,[clang_noversion_=yes])
+     if test $clang_noversion = yes ; then
+       clang_version=unknown
+     else
+       clang_version=$clang_major.$clang_minor.$clang_patchlevel
+     fi
+     lyx_cv_clang_version=$clang_version])
+fi
+])
+
+
+dnl Usage: LYX_CXX_CXX11_FLAGS: add to AM_CXXFLAGS the best flag that
+selects C++11 mode; gives an error when C++11 mode is not found.
+AC_DEFUN([LYX_CXX_CXX11_FLAGS],
+[AC_CACHE_CHECK([for at least C++11 mode], [lyx_cv_cxx11_flags],
+ [lyx_cv_cxx11_flags=none
+  for flag in -std=c++14 -std=c++11 "" -std=c++0x -std=gnu++14 -std=gnu++11 -std=gnu++0x ; do
+    save_CPPFLAGS=$CPPFLAGS
+    CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+    save_CXXFLAGS=$CXXFLAGS
+    CXXFLAGS="$flag $AM_CXXFLAGS $CXXFLAGS"
+    dnl sample openmp source code to test
+    AC_TRY_COMPILE([
+       template <typename T>
+       struct check
+       {
+          static_assert(sizeof(int) <= sizeof(T), "not big enough");
+       };
+
+       typedef check<check<bool>> right_angle_brackets;
+
+       class TestDeleted
+       {
+       public:
+          TestDeleted() = delete;
+       };
+
+
+       int a;
+       decltype(a) b;
+
+       typedef check<int> check_type;
+       check_type c;
+       check_type&& cr = static_cast<check_type&&>(c);
+
+       auto d = a;], [],
+    [lyx_cv_cxx11_flags=$flag; break])
+   CXXFLAGS=$save_CXXFLAGS
+   CPPFLAGS=$save_CPPFLAGS
+  done])
+  if test $lyx_cv_cxx11_flags = none ; then
+    AC_ERROR([Cannot find suitable C++11 mode for compiler $CXX])
+  fi
+  AM_CXXFLAGS="$lyx_cv_cxx11_flags $AM_CXXFLAGS"
+])
+
+
+dnl Usage: LYX_CXX_USE_REGEX
+dnl decide whether we want to use std::regex and set the
+dnl LYX_USE_STD_REGEX macro and conditional accordingly.
+AC_DEFUN([LYX_CXX_USE_REGEX],
+[AC_ARG_ENABLE(std-regex,
+  AC_HELP_STRING([--enable-std-regex],[use std::regex instead of boost::regex (default is autodetected)]),
+  [lyx_std_regex=$enableval],
+  [AC_MSG_CHECKING([for correct regex implementation])
+   save_CPPFLAGS=$CPPFLAGS
+   CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+   save_CXXFLAGS=$CXXFLAGS
+   CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
+   # The following code snippet has been taken taken from example in
+   #   http://stackoverflow.com/questions/8561850/compile-stdregex-iterator-with-gcc
+   AC_TRY_LINK(
+     [
+       #include <regex>
+       #include <iostream>
+
+       #include <string.h>
+
+       typedef std::regex_iterator<const char *> Myiter;
+     ], [
+       const char *pat = "axayaz";
+       Myiter::regex_type rx("a");
+       Myiter next(pat, pat + strlen(pat), rx);
+       Myiter end;
+   ], [lyx_std_regex=yes], [lyx_std_regex=no])
+   CXXFLAGS=$save_CXXFLAGS
+   CPPFLAGS=$save_CPPFLAGS
+   AC_MSG_RESULT([$lyx_std_regex])
+ ])
+
+ if test $lyx_std_regex = yes ; then
+  lyx_flags="$lyx_flags std-regex"
+  AC_DEFINE([LYX_USE_STD_REGEX], 1, [define to 1 if std::regex should be preferred to boost::regex])
+ fi
+ AM_CONDITIONAL([LYX_USE_STD_REGEX], test $lyx_std_regex = yes)
+])
+
+
+dnl Usage: LYX_CXX_USE_CALL_ONCE
+dnl check whether we can use std::call_once and set the
+dnl LYX_USE_STD_CALL_ONCE macro and conditional accordingly.
+AC_DEFUN([LYX_CXX_USE_CALL_ONCE],
+[AC_MSG_CHECKING([for std::call_once availability])
+   save_CPPFLAGS=$CPPFLAGS
+   CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+   save_CXXFLAGS=$CXXFLAGS
+   CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
+   AC_TRY_LINK(
+     [
+       #include <mutex>
+       static std::once_flag flag;
+     ], [
+       std::call_once(flag, [](){ return; });
+   ], [lyx_std_call_once=yes], [lyx_std_call_once=no])
+   CXXFLAGS=$save_CXXFLAGS
+   CPPFLAGS=$save_CPPFLAGS
+   AC_MSG_RESULT([$lyx_std_call_once])
+
+ if test $lyx_std_call_once = yes ; then
+  AC_DEFINE([LYX_USE_STD_CALL_ONCE], 1, [define to 1 if std::call_once is supported by the compiler])
+ fi
+ AM_CONDITIONAL([LYX_USE_STD_CALL_ONCE], test $lyx_std_call_once = yes)
 ])
 
 
@@ -159,15 +288,6 @@ AC_DEFUN([LYX_LIB_STDCXX],
 ])
 
 
-dnl Usage: LYX_CXX_USE_CXX11(STD): pass option -std=STD to the C++ compiler
-dnl        and define LYX_USE_CXX11.
-AC_DEFUN([LYX_CXX_USE_CXX11],
-[lyx_flags="$lyx_flags c++11-mode"
- AM_CXXFLAGS="$AM_CXXFLAGS -std=$1"
- AC_DEFINE([LYX_USE_CXX11], 1, [Define if LyX should use C++11 features])
-])
-
-
 dnl Usage: LYX_LIB_STDCXX_CXX11_ABI: set lyx_cv_lib_stdcxx_cxx11_abi to yes
 dnl        if the STL library is GNU libstdc++ and the C++11 ABI is used.
 AC_DEFUN([LYX_LIB_STDCXX_CXX11_ABI],
@@ -188,8 +308,11 @@ AC_REQUIRE([AC_PROG_CXXCPP])
 
 AC_LANG_PUSH(C++)
 LYX_PROG_CLANG
+LYX_CXX_CXX11_FLAGS
 LYX_LIB_STDCXX
 LYX_LIB_STDCXX_CXX11_ABI
+LYX_CXX_USE_REGEX
+LYX_CXX_USE_CALL_ONCE
 AC_LANG_POP(C++)
 
 if test $lyx_cv_lib_stdcxx = "yes" ; then
@@ -228,18 +351,9 @@ AC_ARG_ENABLE(stdlib-debug,
          [enable_stdlib_debug=no])]
 )
 
-AC_ARG_ENABLE(concept-checks,
-  AC_HELP_STRING([--enable-concept-checks],[enable concept checks]),,
-  [AS_CASE([$build_type], [dev*|pre*], [enable_concept_checks=yes], 
-         [enable_concept_checks=no])]
-  if test x$USE_QT5 = xyes ; then
-      enable_concept_checks=no
-  fi
-)
-
 ### set up optimization
 AC_ARG_ENABLE(optimization,
-    AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),,
+    AC_HELP_STRING([--enable-optimization@<:@=ARG@:>@],[enable compiler optimisation]),,
     enable_optimization=yes;)
 case $enable_optimization in
     yes)
@@ -252,15 +366,6 @@ case $enable_optimization in
     *) lyx_optim=${enable_optimization};;
 esac
 
-AC_ARG_ENABLE(pch,
-  AC_HELP_STRING([--enable-pch],[enable precompiled headers]),,
-       enable_pch=no;)
-lyx_pch_comp=no
-
-AC_ARG_ENABLE(cxx11,
-  AC_HELP_STRING([--enable-cxx11],[enable C++11 mode]),,
-  enable_cxx11=no;)
-
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
   [AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes],
@@ -273,7 +378,6 @@ if test "x$enable_assertions" = xyes ; then
 fi
 
 # set the compiler options correctly.
-lyx_std_regex=no
 if test x$GXX = xyes; then
   dnl clang++ pretends to be g++ 4.2.1; this is not useful
   if test x$CLANG = xno; then
@@ -281,10 +385,11 @@ if test x$GXX = xyes; then
     gxx_version=`${CXX} -dumpversion`
     CXX_VERSION="($gxx_version)"
   else
-    gxx_version=clang
+    gxx_version=clang-$clang_version
+    CXX_VERSION="($clang_version)"
   fi
 
-  AM_CXXFLAGS="$lyx_optim"
+  AM_CXXFLAGS="$lyx_optim $AM_CXXFLAGS"
   if test x$enable_debug = xyes ; then
       AM_CXXFLAGS="-g $AM_CXXFLAGS"
   fi
@@ -301,18 +406,11 @@ if test x$GXX = xyes; then
   fi
   dnl Warnings are for preprocessor too
   if test x$enable_warnings = xyes ; then
-      case $gxx_version in
-          4.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*|clang)
-              AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
-              ;;
-          *)
-              AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra -Wfloat-conversion"
-              ;;
-      esac
+      AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
   fi
   case $gxx_version in
-      2.*|3.*) AC_ERROR([gcc 4.x is required]);;
-      *)  test $enable_pch = yes && lyx_pch_comp=yes ;;
+      2.*|3.*) AC_ERROR([gcc >= 4.6 is required]);;
+      4.0*|4.1*|4.2*|4.3*|4.4*|4.5*) AC_ERROR([gcc >= 4.6 is required]);;
   esac
   if test x$enable_stdlib_debug = xyes ; then
     dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
@@ -325,50 +423,21 @@ if test x$GXX = xyes; then
         ;;
     esac
   fi
-  if test x$enable_concept_checks = xyes ; then
-    case $gxx_version in
-      4.*)
-        lyx_flags="$lyx_flags concept-checks"
-       dnl FIXME check whether this makes sense with clang/libc++
-       AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
-       ;;
-    esac
-  fi
-  if test x$enable_cxx11 = xyes ; then
+fi
+
+# Some additional flags may be needed
+if test x$GXX = xyes; then
     case $gxx_version in
-      4.0*|4.1*|4.2*) AC_ERROR([There is no C++11 support in gcc 4.2 or older]);;
-      4.3*|4.4*|4.5*|4.6*)
-        LYX_CXX_USE_CXX11(gnu++0x);;
-      clang)
-        dnl presumably all clang version support c++11.
-       dnl the deprecated-register warning is very annoying with Qt4.x right now.
-        LYX_CXX_USE_CXX11(c++11 -Wno-deprecated-register);;
-      *)
-        LYX_CXX_USE_CXX11(gnu++11);;
+      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
-    if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then
-      dnl <regex> in gcc is unusable in versions less than 4.9.0
-      dnl see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
-      case $gxx_version in
-        4.0*|4.1*|4.2*|4.3*|4.4*|4.5*|4.6*|4.7*|4.8*) ;;
-       *) lyx_flags="$lyx_flags stdregex"
-          lyx_std_regex=yes
-           ;;
-      esac
-    else
-      lyx_flags="$lyx_flags stdregex"
-      lyx_std_regex=yes
-    fi
-
-    if test $lyx_std_regex = yes ; then
-      AC_DEFINE([LYX_USE_STD_REGEX], 1, [define to 1 if std::regex should be preferred to boost::regex])
-    fi
-  fi
 fi
-AM_CONDITIONAL([LYX_USE_STD_REGEX], test $lyx_std_regex = yes)
-test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch"
-AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes)
-])dnl
+])
 
 dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
 dnl        be used.
@@ -381,38 +450,53 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
        AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
        AC_MSG_RESULT([$lyx_cv_with_included_boost])
        if test x$lyx_cv_with_included_boost = xyes ; then
-           BOOST_INCLUDES='-I$(top_srcdir)/boost'
-           BOOST_LIBS='$(top_builddir)/boost/liblyxboost.a'
+           lyx_included_libs="$lyx_included_libs boost"
+           BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost'
+           if test $lyx_std_regex = yes ; then
+             BOOST_LIBS=""
+           else
+             BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a'
+           fi
        else
-           AC_LANG_PUSH(C++)
-           save_LIBS=$LIBS
-
-           AC_MSG_CHECKING([for multithreaded boost libraries])
-           LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD"
-           AC_LINK_IFELSE(
-               [AC_LANG_PROGRAM([#include <boost/signal.hpp>],
-                       [boost::signal<void ()> s;])],
+           BOOST_INCLUDES=
+           if test $lyx_std_regex = yes ; then
+             BOOST_LIBS=""
+           else
+             AC_LANG_PUSH(C++)
+             save_LIBS=$LIBS
+
+             AC_MSG_CHECKING([for multithreaded boost libraries])
+             LIBS="$save_LIBS -lboost_regex-mt $LIBTHREAD"
+             AC_LINK_IFELSE(
+               [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
+                       [boost::regex reg;])],
                [AC_MSG_RESULT([yes])
                 BOOST_MT="-mt"],
                [AC_MSG_RESULT([no])
                 AC_MSG_CHECKING([for plain boost libraries])
-                LIBS="$save_LIBS -lboost_signals -lm"
+                LIBS="$save_LIBS -lboost_regex"
                 AC_LINK_IFELSE(
-                    [AC_LANG_PROGRAM([#include <boost/signal.hpp>],
-                            [boost::signal<void ()> s;])],
+                    [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
+                            [boost::regex reg;])],
                     [AC_MSG_RESULT([yes])
                      BOOST_MT=""],
                     [AC_MSG_RESULT([no])
                      AC_MSG_ERROR([cannot find suitable boost library (do not use --without-included-boost)])
                 ])
-           ])
-           LIBS=$save_LIBS
-           AC_LANG_POP(C++)
-           BOOST_INCLUDES=
-           if test $lyx_std_regex = yes ; then
-             BOOST_LIBS="-lboost_signals${BOOST_MT}"
-           else
-             BOOST_LIBS="-lboost_regex${BOOST_MT} -lboost_signals${BOOST_MT}"
+             ])
+             LIBS=$save_LIBS
+             AC_LANG_POP(C++)
+
+             dnl In general, system boost libraries are incompatible with
+             dnl the use of stdlib-debug in libstdc++. See ticket #9736 for
+             dnl details.
+             if test $enable_stdlib_debug = "yes" ; then
+               LYX_WARNING([Compiling LyX with stdlib-debug and system boost libraries may lead to
+   crashes. Consider using --disable-stdlib-debug or removing
+   --without-included-boost.])
+             fi
+
+             BOOST_LIBS="-lboost_regex${BOOST_MT}"
            fi
        fi
        AC_SUBST(BOOST_INCLUDES)
@@ -420,6 +504,103 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
 ])
 
 
+dnl Usage: LYX_USE_INCLUDED_ICONV : select if the included iconv should
+dnl        be used.
+AC_DEFUN([LYX_USE_INCLUDED_ICONV],[
+  AC_MSG_CHECKING([whether to use included iconv library])
+  AC_ARG_WITH(included-iconv,
+    [AC_HELP_STRING([--with-included-iconv], [use the iconv lib supplied with LyX instead of the system one])],
+    [lyx_cv_with_included_iconv=$withval],
+    [lyx_cv_with_included_iconv=no])
+  AM_CONDITIONAL(USE_INCLUDED_ICONV, test x$lyx_cv_with_included_iconv = xyes)
+  AC_MSG_RESULT([$lyx_cv_with_included_iconv])
+  if test x$lyx_cv_with_included_iconv = xyes ; then
+  lyx_included_libs="$lyx_included_libs iconv"
+
+dnl Some bits from libiconv configure.ac to avoid a nested configure call:
+    AC_EILSEQ
+    AC_TYPE_MBSTATE_T
+    AC_CHECK_FUNCS([getc_unlocked mbrtowc wcrtomb mbsinit setlocale])
+dnl Ymbstate_t is used if HAVE_WCRTOMB || HAVE_MBRTOWC, see 3rdparty/libiconv/1.14/lib/loop_wchar.h.
+    if test $ac_cv_func_wcrtomb = yes || test $ac_cv_func_mbrtowc = yes; then
+      USE_MBSTATE_T=1
+    else
+      USE_MBSTATE_T=0
+    fi
+    AC_SUBST([USE_MBSTATE_T])
+    AC_CACHE_CHECK([whether <wchar.h> is standalone],
+      [gl_cv_header_wchar_h_standalone],
+      [AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+          [[#include <wchar.h>
+            wchar_t w;]],
+          [[]])],
+        [gl_cv_header_wchar_h_standalone=yes],
+        [gl_cv_header_wchar_h_standalone=no])])
+    if test $gl_cv_header_wchar_h_standalone = yes; then
+      BROKEN_WCHAR_H=0
+    else
+      BROKEN_WCHAR_H=1
+    fi
+    AC_SUBST([BROKEN_WCHAR_H])
+dnl we want const correctness
+    AC_DEFINE_UNQUOTED([ICONV_CONST], [const],
+      [Define as const if the declaration of iconv() needs const.])
+    ICONV_CONST=const
+    AC_SUBST([ICONV_CONST])
+dnl we build a static lib
+    DLL_VARIABLE=
+    AC_SUBST([DLL_VARIABLE])
+    ICONV_INCLUDES='-I$(top_srcdir)/3rdparty/libiconv/1.14 -I$(top_builddir)/3rdparty/libiconv'
+    ICONV_LIBS='\$(top_builddir)/3rdparty/libiconv/liblyxiconv.a'
+    ICONV_ICONV_H_IN=3rdparty/libiconv/iconv.h:3rdparty/libiconv/1.14/include/iconv.h.in
+  else
+    ICONV_INCLUDES=
+    AM_ICONV
+    if test "$am_cv_func_iconv" = no; then
+      AC_MSG_ERROR([cannot find required library iconv.])
+    else
+      ICONV_LIBS="$LIBICONV"
+    fi
+    ICONV_ICONV_H_IN=
+  fi
+  AC_SUBST(ICONV_INCLUDES)
+  AC_SUBST(ICONV_LIBS)
+  AC_SUBST(ICONV_ICONV_H_IN)
+])
+
+
+dnl Usage: LYX_USE_INCLUDED_ZLIB : select if the included zlib should
+dnl        be used.
+AC_DEFUN([LYX_USE_INCLUDED_ZLIB],[
+  AC_MSG_CHECKING([whether to use included zlib library])
+  AC_ARG_WITH(included-zlib,
+    [AC_HELP_STRING([--with-included-zlib], [use the zlib lib supplied with LyX instead of the system one])],
+    [lyx_cv_with_included_zlib=$withval],
+    [lyx_cv_with_included_zlib=no])
+  AM_CONDITIONAL(USE_INCLUDED_ZLIB, test x$lyx_cv_with_included_zlib = xyes)
+  AC_MSG_RESULT([$lyx_cv_with_included_zlib])
+  if test x$lyx_cv_with_included_zlib = xyes ; then
+    lyx_included_libs="$lyx_included_libs zlib"
+    ZLIB_INCLUDES='-I$(top_srcdir)/3rdparty/zlib/1.2.8 -I$(top_builddir)/3rdparty/zlib'
+    ZLIB_LIBS='$(top_builddir)/3rdparty/zlib/liblyxzlib.a'
+    mkdir -p 3rdparty/zlib
+dnl include standard config.h for HAVE_UNISTD_H
+    echo "#include <../../config.h>" > 3rdparty/zlib/zconf.h
+dnl prevent clash with system zlib that might be dragged in by other libs
+    echo "#define Z_PREFIX 1" >> 3rdparty/zlib/zconf.h
+    cat "${srcdir}/3rdparty/zlib/1.2.8/zconf.h.in" >> 3rdparty/zlib/zconf.h
+  else
+    ZLIB_INCLUDES=
+    AC_CHECK_HEADERS(zlib.h,
+      [AC_CHECK_LIB(z, gzopen, [ZLIB_LIBS="-lz"], LYX_LIB_ERROR(libz,zlib))],
+      [LYX_LIB_ERROR(zlib.h,zlib)])
+  fi
+  AC_SUBST(ZLIB_INCLUDES)
+  AC_SUBST(ZLIB_LIBS)
+])
+
+
 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],
@@ -446,31 +627,44 @@ fi
 dnl Usage: LYX_USE_INCLUDED_MYTHES : select if the included MyThes should
 dnl        be used.
 AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[
-       AC_MSG_CHECKING([whether to use included MyThes library])
-       AC_ARG_WITH(included-mythes,
-           [AC_HELP_STRING([--without-included-mythes], [do not use the MyThes lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])],
-           [lyx_cv_with_included_mythes=$withval],
-           [lyx_cv_with_included_mythes=yes])
-       AM_CONDITIONAL(USE_INCLUDED_MYTHES, test x$lyx_cv_with_included_mythes = xyes)
-       AC_MSG_RESULT([$lyx_cv_with_included_mythes])
-       if test x$lyx_cv_with_included_mythes != xyes ; then
-               AC_LANG_PUSH(C++)
-               AC_CHECK_HEADER(mythes.hxx,[ac_cv_header_mythes_h=yes lyx_cv_mythes_h_location="<mythes.hxx>"])
-               if test x$ac_cv_header_mythes_h != xyes; then
-                       AC_CHECK_HEADER(mythes/mythes.hxx,[ac_cv_header_mythes_h=yes lyx_cv_mythes_h_location="<mythes/mythes.hxx>"])
-               fi
-               AC_CHECK_LIB(mythes, main, [MYTHES_LIBS="-lmythes" lyx_mythes=yes], [lyx_mythes=no], [-lm])
-               if test x$lyx_mythes != xyes; then
-                       AC_CHECK_LIB(mythes-1.2, main, [MYTHES_LIBS="-lmythes-1.2" lyx_mythes=yes], [lyx_mythes=no], [-lm])
-               fi
-               AC_LANG_POP(C++)
-               if test x$lyx_mythes != xyes -o x$ac_cv_header_mythes_h != xyes; then
-                       AC_MSG_ERROR([cannot find suitable MyThes library (do not use --without-included-mythes)])
-               fi
-               AC_DEFINE(USE_EXTERNAL_MYTHES, 1, [Define as 1 to use an external MyThes library])
-               AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx])
-               AC_SUBST(MYTHES_LIBS)
-       fi
+  AC_ARG_WITH(included-mythes,
+    [AC_HELP_STRING([--with-included-mythes], [force to use the MyThes lib supplied with LyX])],
+    [use_included_mythes=$withval],
+    [use_included_mythes=no])
+  if test x$use_included_mythes != xyes ; then
+    AC_LANG_PUSH(C++)
+    use_included_mythes=yes
+    AC_CHECK_HEADERS([mythes.hxx mythes/mythes.hxx],
+      [mythes_h_location="<$ac_header>"
+       save_LIBS=$LIBS
+       AC_MSG_CHECKING([checking for MyThes library])
+       for ac_lib in mythes mythes-1.2 ; do
+        LIBS="-l$ac_lib $save_LIBS"
+        AC_LINK_IFELSE(
+          [AC_LANG_PROGRAM([#include <cstdio>]
+              [#include $mythes_h_location], [MyThes dummy("idx","dat")])],
+          [MYTHES_LIBS=-l$ac_lib
+            AC_MSG_RESULT([$MYTHES_LIBS])
+           use_included_mythes=no])
+       done
+       if test $use_included_mythes != no ; then
+        AC_MSG_RESULT([not found])
+       fi
+       break])
+    AC_LANG_POP(C++)
+  fi
+  if test $use_included_mythes = yes ; then
+    mythes_h_location="<mythes.hxx>"
+    MYTHES_INCLUDES='-I$(top_srcdir)/3rdparty/mythes/1.2.5/'
+    MYTHES_LIBS='$(top_builddir)/3rdparty/mythes/liblyxmythes.a'
+    lyx_included_libs="$lyx_included_libs mythes"
+  fi
+  AM_CONDITIONAL(USE_INCLUDED_MYTHES, test x$use_included_mythes = xyes)
+  AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$mythes_h_location,[Location of mythes.hxx])
+  AC_SUBST(MYTHES_INCLUDES)
+  AC_SUBST(MYTHES_LIBS)
+  AC_MSG_CHECKING([whether to use included MyThes library])
+  AC_MSG_RESULT([$use_included_mythes])
 ])
 
 
@@ -487,7 +681,8 @@ AC_DEFUN([LYX_WITH_DIR],[
     test "x$with_$3" = xyes && with_$3=$5
     lyx_cv_$3="$with_$3"
   fi
-  AC_MSG_RESULT($lyx_cv_$3)])
+  AC_MSG_RESULT($lyx_cv_$3)
+])
 
 
 dnl Usage: LYX_LOOP_DIR(value,action)
@@ -561,13 +756,15 @@ rm -f conftest*])
 AC_DEFUN([LYX_USE_PACKAGING],
 [AC_MSG_CHECKING([what packaging should be used])
 AC_ARG_WITH(packaging,
-  [AC_HELP_STRING([--with-packaging=THIS], [use THIS packaging for installation:
-                           Possible values: posix, windows, macosx])],
+  [AC_HELP_STRING([--with-packaging=STR], [set packaging for installation among:
+                           posix, windows, macosx, haiku (default is autodetected)])],
   [lyx_use_packaging="$withval"], [
   case $host in
     *-apple-darwin*) lyx_use_packaging=macosx ;;
-     *-pc-mingw32*) lyx_use_packaging=windows;;
-                  *) lyx_use_packaging=posix;;
+    *-pc-mingw*) lyx_use_packaging=windows ;;
+    *-mingw32*) lyx_use_packaging=windows ;;
+    *haiku*) lyx_use_packaging=haiku ;;
+    *) lyx_use_packaging=posix ;;
   esac])
 AC_MSG_RESULT($lyx_use_packaging)
 lyx_install_posix=false
@@ -600,10 +797,16 @@ case $lyx_use_packaging in
           pkgdatadir='${datadir}/${PACKAGE}'
           default_prefix=$ac_default_prefix
           case ${host} in
-          *cygwin*) lyx_install_cygwin=true ;;
-               *apple-darwin*) lyx_install_macosx=true ;;
+            *cygwin*) lyx_install_cygwin=true ;;
+            *apple-darwin*) lyx_install_macosx=true ;;
           esac
           lyx_install_posix=true ;;
+       haiku) AC_DEFINE(USE_HAIKU_PACKAGING, 1, [Define to 1 if LyX should use a Haiku-style file layout])
+          PACKAGE=lyx${version_suffix}
+          program_suffix=$version_suffix
+          pkgdatadir='${datadir}/${PACKAGE}'
+          default_prefix=$ac_default_prefix
+          lyx_install_posix=true ;;
     *) AC_MSG_ERROR([unknown packaging type $lyx_use_packaging.]) ;;
 esac
 AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx)
@@ -695,9 +898,17 @@ dnl Defines HAVE_DEF_{NAME}
 AC_DEFUN([LYX_CHECK_DEF],
 [LYX_AH_CHECK_DEF($1, $2)
  AC_MSG_CHECKING([whether $1 is defined by header $2])
+ save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+ save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS"
+ AC_LANG_PUSH(C++)
  AC_TRY_COMPILE([#include <$2>], [$3],
      lyx_have_def_name=yes,
      lyx_have_def_name=no)
+ AC_LANG_POP(C++)
+ CXXFLAGS=$save_CXXFLAGS
+ CPPFLAGS=$save_CPPFLAGS
  AC_MSG_RESULT($lyx_have_def_name)
  if test "x$lyx_have_def_name" = xyes; then
    AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_DEF_$1))
@@ -725,23 +936,3 @@ AC_DEFUN([LYX_SET_VERSION_INFO],
  AC_SUBST(LYX_USERDIR_VER,"$lyx_userdir_ver")
 ])
 
-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ---------------------------------------------------------------------------
-# Copied from autoconf 2.68, added a check that python version is < 3.0
-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
-# Run ACTION-IF-FALSE otherwise.
-# This test uses sys.hexversion instead of the string equivalent (first
-# word of sys.version), in order to cope with versions such as 2.2c1.
-# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
- [prog="import sys
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-# map returns an iterator in Python 3.0 and a list in 2.x
-minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
-minverhex = 0
-maxverhex = 50331648 # = 3.0.0.0
-# xrange is not present in Python 3.0 and range returns an iterator
-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
-sys.exit(sys.hexversion < minverhex or sys.hexversion >= maxverhex)"
-  AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])