AC_SUBST(lyx_devel_version)
])
-dnl If LyX is compiled from a git clone, find the HEAD commit hash
-dnl
-dnl
-AC_DEFUN([LYX_CHECK_GIT_COMMIT], [
-AC_MSG_CHECKING([for git commit hash])
-lyxgitcommit=`cd "$srcdir" && git log -1 --pretty=format:%H 2>/dev/null || true`
-test x$lyxgitcommit = x && lyxgitcommit="none"
-AC_MSG_RESULT($lyxgitcommit)
-])
-
dnl Define the option to set a LyX version on installed executables and directories
dnl
])
+dnl Check whether to configure for Qt5. Default is Qt4.
+dnl
+AC_DEFUN([LYX_CHECK_QT5],[
+AC_MSG_CHECKING([whether Qt5 is requested])
+AC_ARG_ENABLE([qt5],
+ [ --enable-qt5 use Qt5 for building],
+ USE_QT5=$enableval, USE_QT5=no)
+AC_MSG_RESULT([$USE_QT5])
+AC_SUBST([USE_QT5])
+])
+
+
dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the
dnl flag lyx_warning to yes.
AC_DEFUN([LYX_WARNING],[
])
+dnl Usage: LYX_PROG_CLANG: set lyx_cv_prog_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],
+[AC_TRY_COMPILE([], [
+#ifndef __clang__
+ this is not clang
+#endif
+],
+[lyx_cv_prog_clang=yes ; CLANG=yes], [lyx_cv_prog_clang=no ; CLANG=no])])
+])
+
+
+dnl Usage: LYX_LIB_STDCXX: set lyx_cv_lib_stdcxx to yes if the STL library is libstdc++.
+AC_DEFUN([LYX_LIB_STDCXX],
+[AC_CACHE_CHECK([whether STL is libstdc++],
+ [lyx_cv_lib_stdcxx],
+[AC_TRY_COMPILE([#include<vector>], [
+#if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__)
+ this is not libstdc++
+#endif
+],
+[lyx_cv_lib_stdcxx=yes], [lyx_cv_lib_stdcxx=no])])
+])
+
+
AC_DEFUN([LYX_PROG_CXX],
[AC_MSG_CHECKING([for a good enough C++ compiler])
LYX_SEARCH_PROG(CXX, $CXX $CCC g++ gcc c++ CC cxx xlC cc++, [LYX_PROG_CXX_WORKS])
fi
AC_MSG_RESULT($CXX)
-AC_PROG_CXX
-AC_PROG_CXXCPP
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([AC_PROG_CXXCPP])
+AC_LANG_PUSH(C++)
+LYX_PROG_CLANG
+LYX_LIB_STDCXX
+AC_LANG_POP(C++)
+
+if test $lyx_cv_lib_stdcxx = "yes" ; then
+ AC_DEFINE(STD_STRING_USES_COW, 1, [std::string uses copy-on-write])
+else
+ if test $lyx_cv_prog_clang = "yes" ; then
+ AC_DEFINE(USE_LLVM_LIBCPP, 1, [use libc++ provided by llvm instead of GNU libstdc++])
+ fi
+fi
### We might want to get or shut warnings.
AC_ARG_ENABLE(warnings,
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
fi
# set the compiler options correctly.
+lyx_std_regex=no
if test x$GXX = xyes; then
- dnl Useful for global version info
- gxx_version=`${CXX} -dumpversion`
- CXX_VERSION="($gxx_version)"
+ dnl clang++ pretends to be g++ 4.2.1; this is not useful
+ if test x$CLANG = xno; then
+ dnl Useful for global version info
+ gxx_version=`${CXX} -dumpversion`
+ CXX_VERSION="($gxx_version)"
+ fi
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS="$ac_save_CXXFLAGS"
fi
fi
if test "$ac_env_CPPFLAGS_set" != set; then
+ if test x$USE_QT5 = xyes ; then
+ AS_CASE([$host], [*mingw*|*cygwin*], [], [CPPFLAGS="-fPIC $CPPFLAGS"])
+ fi
if test x$enable_warnings = xyes ; then
case $gxx_version in
3.1*|3.2*|3.3*)
*) AM_CXXFLAGS="";;
esac
if test x$enable_stdlib_debug = xyes ; then
+ dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
+ dnl See http://clang-developers.42468.n3.nabble.com/libc-debug-mode-td3336742.html
case $gxx_version in
3.4*|4.*)
lyx_flags="$lyx_flags stdlib-debug"
case $gxx_version in
3.3*)
lyx_flags="$lyx_flags concept-checks"
+ dnl FIXME check whether this makes sense with clang/libc++
AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS, 1, [libstdc++ concept checking])
;;
3.4*|4.*)
esac
fi
if test x$enable_cxx11 = xyes ; then
+ dnl FIXME: check what to do with clang (is anything needed at all?)
case $gxx_version in
4.3*|4.4*|4.5*|4.6*)
lyx_flags="$lyx_flags c++11-mode"
CXXFLAGS="-std=gnu++0x $CXXFLAGS"
;;
- 4.7*|4.8*)
+ 4.7*|4.8*|4.9*)
lyx_flags="$lyx_flags c++11-mode"
CXXFLAGS="-std=gnu++11 $CXXFLAGS"
;;
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.9*)
+ 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
LIBS=$save_LIBS
AC_LANG_POP(C++)
BOOST_INCLUDES=
- BOOST_LIBS="-lboost_regex${BOOST_MT} -lboost_signals${BOOST_MT}"
+ if test $lyx_std_regex = yes ; then
+ BOOST_LIBS="-lboost_signals${BOOST_MT}"
+ else
+ BOOST_LIBS="-lboost_regex${BOOST_MT} -lboost_signals${BOOST_MT}"
+ fi
fi
AC_SUBST(BOOST_INCLUDES)
AC_SUBST(BOOST_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],
+[AC_CACHE_CHECK([whether printing callstack is possible],
+ [lyx_cv_callstack_printing],
+[AC_TRY_COMPILE([
+#include <execinfo.h>
+#include <cxxabi.h>
+], [
+ void* array[200];
+ size_t size = backtrace(array, 200);
+ backtrace_symbols(array, size);
+ int status = 0;
+ abi::__cxa_demangle("abcd", 0, 0, &status);
+],
+[lyx_cv_callstack_printing=yes], [lyx_cv_callstack_printing=no])])
+if test x"$lyx_cv_callstack_printing" = xyes; then
+ AC_DEFINE([LYX_CALLSTACK_PRINTING], 1,
+ [Define if callstack can be printed])
+fi
+])
+
+
dnl Usage: LYX_USE_INCLUDED_MYTHES : select if the included MyThes should
dnl be used.
AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[
projects / lyx.git / blobdiff