X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=33c59794162ebb9c0eff9e290876755ab6eb541a;hb=c1c439b94dd6d5802e9a48b8c4e45c13fad6f869;hp=bb94bfc5b2b880a77ddbf4d1cb628d25031f5228;hpb=2bf021ee739fbf3859dc9044a80a0de01ea90bc1;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index bb94bfc5b2..33c5979416 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -8,9 +8,10 @@ dnl Usage LYX_CHECK_VERSION Displays version of LyX being built and dnl sets variable "build_type" AC_DEFUN([LYX_CHECK_VERSION],[ echo "configuring LyX version" AC_PACKAGE_VERSION + +AC_MSG_CHECKING([for build type]) lyx_devel_version=no lyx_prerelease=no -AC_MSG_CHECKING([for build type]) 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]), [case $enableval in @@ -19,10 +20,10 @@ AC_ARG_ENABLE(build-type, prof*) build_type=profiling;; gprof*) build_type=gprof;; rel*) build_type=release;; - *) AC_ERROR([Bad build type specification \"$enableval\". Please use one of rel(ease), pre(release), dev(elopment), prof(iling), or gprof]);; + *) 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 - *svn*) build_type=development;; + *dev*) build_type=development;; *pre*|*alpha*|*beta*|*rc*) build_type=prerelease;; *) build_type=release ;; esac]) @@ -34,7 +35,7 @@ case $build_type in LYX_DATE="not released yet" ;; prerelease) lyx_prerelease=yes ;; esac - + AC_SUBST(lyx_devel_version) ]) @@ -56,19 +57,11 @@ AC_ARG_WITH(version-suffix, AC_SUBST(version_suffix,$withval) RPM_VERSION_SUFFIX="--with-version-suffix=$withval"]) AC_SUBST(RPM_VERSION_SUFFIX) +AC_SUBST(program_base_name,"lyx") AC_MSG_RESULT([$withval]) ]) -dnl Usage: LYX_ERROR(message) Displays the warning "message" and sets the -dnl flag lyx_error to yes. -AC_DEFUN([LYX_ERROR],[ -lyx_error_txt="$lyx_error_txt -** $1 -" -lyx_error=yes]) - - dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the dnl flag lyx_warning to yes. AC_DEFUN([LYX_WARNING],[ @@ -81,36 +74,20 @@ lyx_warning=yes]) dnl Usage: LYX_LIB_ERROR(file,library) Displays an error message indication dnl that 'file' cannot be found because 'lib' may be uncorrectly installed. AC_DEFUN([LYX_LIB_ERROR],[ -LYX_ERROR([Cannot find $1. Please check that the $2 library +AC_MSG_ERROR([cannot find $1. Please check that the $2 library is correctly installed on your system.])]) -dnl Usage: LYX_CHECK_ERRORS Displays a warning message if a LYX_ERROR +dnl Usage: LYX_CHECK_WARNINGS Displays a warning message if a LYX_WARNING dnl has occured previously. -AC_DEFUN([LYX_CHECK_ERRORS],[ +AC_DEFUN([LYX_CHECK_WARNINGS],[ if test x$lyx_warning = xyes; then cat <], [ +#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]) @@ -173,8 +176,20 @@ if test -z "$CXX" ; then 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, @@ -206,11 +221,6 @@ AC_ARG_ENABLE(concept-checks, [enable_concept_checks=no])] ) -AC_ARG_ENABLE(gprof, - AC_HELP_STRING([--enable-gprof],[enable profiling using gprof]),, - [AS_CASE([$build_type], [gprof], [enable_gprof=yes], [enable_gprof=no])] -) - ### set up optimization AC_ARG_ENABLE(optimization, AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),, @@ -231,6 +241,10 @@ AC_ARG_ENABLE(pch, 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], @@ -244,23 +258,30 @@ fi # set the compiler options correctly. 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" else - CFLAGS="$lyx_opt" - CXXFLAGS="$lyx_opt" + CFLAGS="$lyx_opt" + CXXFLAGS="$lyx_opt" if test x$enable_debug = xyes ; then - CFLAGS="-g $CFLAGS" - CXXFLAGS="-g $CXXFLAGS" + CFLAGS="-g $CFLAGS" + CXXFLAGS="-g $CXXFLAGS" + fi + if test $build_type = gprof ; then + CFLAGS="-pg $CFLAGS" + CXXFLAGS="-pg $CXXFLAGS" + LDFLAGS="-pg $LDFLAGS" fi - if test x$enable_gprof = xyes ; then - CFLAGS="-pg $CFLAGS" - CXXFLAGS="-pg $CXXFLAGS" - LDFLAGS="-pg $LDFLAGS" + if test $build_type = profiling ; then + CFLAGS="$CFLAGS -fno-omit-frame-pointer" + CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer" fi fi if test "$ac_env_CPPFLAGS_set" != set; then @@ -285,6 +306,8 @@ if test x$GXX = xyes; then *) 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" @@ -297,6 +320,7 @@ if test x$GXX = xyes; then 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.*) @@ -305,6 +329,19 @@ if test x$GXX = xyes; then ;; 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*) + lyx_flags="$lyx_flags c++11-mode" + CXXFLAGS="-std=gnu++11 $CXXFLAGS" + ;; + esac + fi fi test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch" AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes) @@ -320,29 +357,62 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[ [lyx_cv_with_included_boost=yes]) 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 - AC_LANG_PUSH(C++) - SAVED_LDFLAGS=$LDFLAGS - - LDFLAGS="$SAVED_LDFLAGS -lboost_signals -lm" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [boost::signal s;])], [lyx_boost_underscore=yes], []) - LDFLAGS="$SAVED_LDFLAGS -lboost_signals-mt -lm $LIBTHREAD" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [boost::signal s;])], [lyx_boost_underscore_mt=yes], []) + if test x$lyx_cv_with_included_boost = xyes ; then + BOOST_INCLUDES='-I$(top_srcdir)/boost' + BOOST_LIBS='$(top_builddir)/boost/liblyxboost.a' + 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 s;])], + [AC_MSG_RESULT([yes]) + BOOST_MT="-mt"], + [AC_MSG_RESULT([no]) + AC_MSG_CHECKING([for plain boost libraries]) + LIBS="$save_LIBS -lboost_signals -lm" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include ], + [boost::signal s;])], + [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= + BOOST_LIBS="-lboost_regex${BOOST_MT} -lboost_signals${BOOST_MT}" + fi + AC_SUBST(BOOST_INCLUDES) + AC_SUBST(BOOST_LIBS) +]) - LDFLAGS=$SAVED_LDFLAGS - AC_LANG_POP(C++) - if test x$lyx_boost_underscore_mt = xyes ; then - BOOST_MT="-mt" - else - BOOST_MT="" - if test x$lyx_boost_plain != xyes -a x$lyx_boost_underscore != xyes ; then - LYX_ERROR([No suitable boost library found (do not use --without-included-boost)]) - fi - fi - AC_SUBST(BOOST_SEP) - AC_SUBST(BOOST_MT) - 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], +[AC_CACHE_CHECK([whether printing callstack is possible], + [lyx_cv_callstack_printing], +[AC_TRY_COMPILE([ +#include +#include +], [ + 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 ]) @@ -368,7 +438,7 @@ AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[ fi AC_LANG_POP(C++) if test x$lyx_mythes != xyes -o x$ac_cv_header_mythes_h != xyes; then - LYX_ERROR([No suitable MyThes library found (do not use --without-included-mythes)]) + 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]) @@ -459,25 +529,6 @@ rm -f conftest*]) ]) ### end of LYX_PATH_HEADER -### Check which frontends we want to use. -### -AC_DEFUN([LYX_USE_FRONTENDS], -[AC_MSG_CHECKING([what frontend should be used for the GUI]) -AC_ARG_WITH(frontend, - [AC_HELP_STRING([--with-frontend=THIS], [use THIS frontend as main GUI: - Possible values: qt4])], - [FRONTENDS="$withval"],[FRONTENDS="qt4"]) -if test "x$FRONTENDS" = x ; then - AC_MSG_RESULT(none) - AC_ERROR("Please select a frontend using --with-frontend") -fi -AC_MSG_RESULT($FRONTENDS) -AC_SUBST(FRONTENDS) -AC_SUBST(FRONTENDS_SUBDIRS) -AC_SUBST(FRONTENDS_PROGS) -]) - - ## Check what kind of packaging should be used at install time. ## The default is autodetected. AC_DEFUN([LYX_USE_PACKAGING], @@ -492,6 +543,7 @@ AC_ARG_WITH(packaging, *) lyx_use_packaging=posix;; esac]) AC_MSG_RESULT($lyx_use_packaging) +lyx_install_posix=false lyx_install_macosx=false lyx_install_cygwin=false lyx_install_windows=false @@ -499,6 +551,7 @@ case $lyx_use_packaging in macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout]) PACKAGE=LyX${version_suffix} default_prefix="/Applications/${PACKAGE}.app" + AC_SUBST(osx_bundle_program_name,"${program_base_name}") bindir='${prefix}/Contents/MacOS' libdir='${prefix}/Contents/Resources' datarootdir='${prefix}/Contents/Resources' @@ -521,17 +574,15 @@ case $lyx_use_packaging in default_prefix=$ac_default_prefix case ${host} in *cygwin*) lyx_install_cygwin=true ;; + *apple-darwin*) lyx_install_macosx=true ;; esac lyx_install_posix=true ;; - *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;; + *) AC_MSG_ERROR([unknown packaging type $lyx_use_packaging.]) ;; esac AM_CONDITIONAL(INSTALL_MACOSX, $lyx_install_macosx) AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows) AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin) AM_CONDITIONAL(INSTALL_POSIX, $lyx_install_posix) -dnl Next two lines are only for autoconf <= 2.59 -datadir='${datarootdir}' -AC_SUBST(datarootdir) AC_SUBST(pkgdatadir) AC_SUBST(program_suffix) ])