X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=8decd37ed93490776551f548047c5897af383530;hb=395d9e09e2c091bffc68de2d12831d01a7986ef1;hp=c62960ad88bb659084126ad9650e084af0d2a3bc;hpb=f792fe8037da9a467bfb44a74e00518916378db4;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index c62960ad88..8decd37ed9 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,17 +57,21 @@ 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 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 @@ -81,36 +86,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 has occured previously. -AC_DEFUN([LYX_CHECK_ERRORS],[ +dnl Usage: LYX_CHECK_WARNINGS Displays a warning message if a LYX_WARNING +dnl has occurred previously. +AC_DEFUN([LYX_CHECK_WARNINGS],[ if test x$lyx_warning = xyes; then cat <conftest.C <&5 || CXX= -rm -f conftest.C conftest.o conftest.obj || true +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], +[AC_TRY_COMPILE([], [ +#ifndef __clang__ + this is not clang +#endif +], +[lyx_cv_prog_clang=yes ; CLANG=yes], [lyx_cv_prog_clang=no ; CLANG=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]) +dnl Usage: LYX_CXX_CXX11: set lyx_use_cxx11 to yes if the compiler implements +dnl the C++11 standard. +AC_DEFUN([LYX_CXX_CXX11], +[AC_CACHE_CHECK([whether the compiler implements C++11], + [lyx_cv_cxx_cxx11], + [save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" + AC_LANG_PUSH(C++) + AC_TRY_COMPILE([], [ +#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) + this is a c++11 compiler +#endif + ], + [lyx_cv_cxx_cxx11=no], [lyx_cv_cxx_cxx11=yes ; lyx_flags="$lyx_flags c++11"]) + AC_LANG_POP(C++) + CXXFLAGS=$save_CXXFLAGS + CPPFLAGS=$save_CPPFLAGS]) + lyx_use_cxx11=$lyx_cv_cxx_cxx11 +]) + + +dnl Usage: LYX_CXX_USE_REGEX(cxx11_flags) +dnl decide whether we want to use std::regex and set the +dnl LYX_USE_STD_REGEX accordingly. +dnl the extra cxx11 flags have to be passed to the preprocessor. They are +dnl not plainly added to AM_CPPFLAGS because then the objc compiler (mac) +dnl would fail. +AC_DEFUN([LYX_CXX_USE_REGEX], +[lyx_std_regex=no + if test $lyx_use_cxx11 = yes; then + save_CPPFLAGS=$CPPFLAGS + # we want to pass -std=c++11 to clang/cpp if necessary + CPPFLAGS="$AM_CPPFLAGS $1 $CPPFLAGS" + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" + AC_LANG_PUSH(C++) + AC_CHECK_HEADER([regex], [lyx_std_regex=yes], [lyx_std_regex=no]) + AC_LANG_POP(C++) + CXXFLAGS=$save_CXXFLAGS + CPPFLAGS=$save_CPPFLAGS + if test x$GXX = xyes && test $lyx_std_regex = yes ; then + AC_MSG_CHECKING([for correct regex implementation]) + if test x$CLANG = xno || test $lyx_cv_lib_stdcxx = yes; then + dnl 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_std_regex=no ;; + *) ;; + esac + fi + fi + AC_MSG_RESULT([$lyx_std_regex]) + fi + + 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_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], [ +#if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__) + this is not libstdc++ +#endif +], +[lyx_cv_lib_stdcxx=yes], [lyx_cv_lib_stdcxx=no])]) +]) -if test -z "$CXX" ; then - AC_MSG_ERROR([Unable to find a good enough C++ compiler]) -fi -AC_MSG_RESULT($CXX) -AC_PROG_CXX -AC_PROG_CXXCPP +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], +[AC_CACHE_CHECK([whether STL is libstdc++ using the C++11 ABI], + [lyx_cv_lib_stdcxx_cxx11_abi], +[AC_TRY_COMPILE([#include], [ +#if ! defined(_GLIBCXX_USE_CXX11_ABI) || ! _GLIBCXX_USE_CXX11_ABI + this is not libstdc++ using the C++11 ABI +#endif +], +[lyx_cv_lib_stdcxx_cxx11_abi=yes], [lyx_cv_lib_stdcxx_cxx11_abi=no])]) +]) + + +AC_DEFUN([LYX_PROG_CXX], +[AC_REQUIRE([AC_PROG_CXX]) +AC_REQUIRE([AC_PROG_CXXCPP]) + +AC_LANG_PUSH(C++) +LYX_PROG_CLANG +LYX_LIB_STDCXX +LYX_LIB_STDCXX_CXX11_ABI +AC_LANG_POP(C++) + +if test $lyx_cv_lib_stdcxx = "yes" ; then + if test $lyx_cv_lib_stdcxx_cxx11_abi = "yes" ; then + AC_DEFINE(USE_GLIBCXX_CXX11_ABI, 1, [use GNU libstdc++ with C++11 ABI]) + else + AC_DEFINE(STD_STRING_USES_COW, 1, [std::string uses copy-on-write]) + fi +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, @@ -200,17 +283,6 @@ 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])] -) - -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]),, @@ -218,18 +290,17 @@ AC_ARG_ENABLE(optimization, case $enable_optimization in yes) if test $lyx_devel_version = yes ; then - lyx_opt=-O + lyx_optim=-O else - lyx_opt=-O2 + lyx_optim=-O2 fi;; - no) lyx_opt=;; - *) lyx_opt=${enable_optimization};; + no) lyx_optim=;; + *) 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([--disable-cxx11],[disable C++11 mode (default: enabled for known good compilers)]),, + enable_cxx11=auto;) AC_ARG_ENABLE(assertions, AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, @@ -244,71 +315,85 @@ 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)" - - if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS="$ac_save_CXXFLAGS" + 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)" else - CFLAGS="$lyx_opt" - CXXFLAGS="$lyx_opt" - if test x$enable_debug = xyes ; then - CFLAGS="-g $CFLAGS" - CXXFLAGS="-g $CXXFLAGS" - fi - if test x$enable_gprof = xyes ; then - CFLAGS="-pg $CFLAGS" - CXXFLAGS="-pg $CXXFLAGS" - LDFLAGS="-pg $LDFLAGS" - fi + gxx_version=clang fi - if test "$ac_env_CPPFLAGS_set" != set; then - if test x$enable_warnings = xyes ; then - case $gxx_version in - 3.1*|3.2*|3.3*) - CPPFLAGS="-W -Wall $CPPFLAGS" - ;; - *) - CPPFLAGS="-Wextra -Wall $CPPFLAGS " - ;; - esac - fi + + AM_CXXFLAGS="$lyx_optim" + if test x$enable_debug = xyes ; then + AM_CXXFLAGS="-g $AM_CXXFLAGS" + fi + if test $build_type = gprof ; then + AM_CXXFLAGS="$AM_CXXFLAGS -pg" + AM_LDFLAGS="$AM_LDFLAGS -pg" + fi + if test $build_type = profiling ; then + AM_CXXFLAGS="$AM_CXXFLAGS -fno-omit-frame-pointer" + fi + + if test x$USE_QT5 = xyes ; then + AS_CASE([$host], [*mingw*|*cygwin*], [], [AM_CXXFLAGS="-fPIC $AM_CXXFLAGS"]) + fi + dnl Warnings are for preprocessor too + if test x$enable_warnings = xyes ; then + AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra" fi case $gxx_version in - 3.1*) AM_CXXFLAGS="-finline-limit=500 ";; - 3.2*|3.3*) AM_CXXFLAGS="";; - 3.4*|4.*) - AM_CXXFLAGS="" - test $enable_pch = yes && lyx_pch_comp=yes - ;; - *) AM_CXXFLAGS="";; + 2.*|3.*) AC_ERROR([gcc 4.x is required]);; 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" AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode]) AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode]) ;; esac fi - if test x$enable_concept_checks = xyes ; then + dnl enable_cxx11 can be yes/no/auto. + dnl By default, it is auto and we enable C++11 when possible + if test x$enable_cxx11 != xno ; then case $gxx_version in - 3.3*) - lyx_flags="$lyx_flags concept-checks" - AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS, 1, [libstdc++ concept checking]) - ;; - 3.4*|4.*) - lyx_flags="$lyx_flags concept-checks" - AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1, [libstdc++ concept checking]) - ;; + 4.0*|4.1*|4.2*) + if test x$enable_cxx11 = xyes; then + AC_ERROR([There is no C++11 support in gcc 4.2 or older]) + fi;; + 4.3*|4.4*|4.5*|4.6*) + dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__. + dnl The source code relies on that. + cxx11_flags="-std=c++0x";; + clang) + dnl presumably all clang versions support c++11. + dnl the deprecated-register warning is very annoying with Qt4.x right now. + cxx11_flags="-std=c++11" + AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";; + *) + AS_CASE([$host], [*cygwin*], + [cxx11_flags="-std=gnu++11"], + [cxx11_flags="-std=c++11"]);; esac + # cxx11_flags is useful when running preprocessor alone + # (see detection of regex). + AM_CXXFLAGS="$cxx11_flags $AM_CXXFLAGS" fi fi -test "$lyx_pch_comp" = yes && lyx_flags="$lyx_flags pch" -AM_CONDITIONAL(LYX_BUILD_PCH, test "$lyx_pch_comp" = yes) -])dnl + +LYX_CXX_CXX11 +if test $lyx_use_cxx11 = yes; then + if test x$GXX = xyes; then + dnl We still use auto_ptr, which is obsoleted. Shut off the warnings. + AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-declarations" + fi +fi +LYX_CXX_USE_REGEX([$cxx11_flags]) +]) dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should dnl be used. @@ -320,20 +405,75 @@ 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_CHECK_LIB(boost_signals, main, [lyx_boost_underscore=yes], [], [-lm]) - AC_CHECK_LIB(boost_signals-mt, main, [lyx_boost_underscore_mt=yes], [], [-lm $LIBTHREAD]) - 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) + if test x$lyx_cv_with_included_boost = xyes ; then + BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost' + BOOST_LIBS='$(top_builddir)/3rdparty/boost/liblyxboost.a' + else + AC_LANG_PUSH(C++) + save_LIBS=$LIBS + + AC_MSG_CHECKING([for multithreaded boost libraries]) + LIBS="$save_LIBS -lboost_signals-mt $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" + 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= + 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 + + 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 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 +#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 ]) @@ -353,13 +493,13 @@ AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[ 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=""]) fi - AC_CHECK_LIB(mythes, main, [MYTHES_LIBS="-lmythes" lyx_mythes=yes], [lyx_mythes=no], [-lm]) + AC_CHECK_LIB(mythes, main, [MYTHES_LIBS="-lmythes" lyx_mythes=yes], [lyx_mythes=no]) 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]) + AC_CHECK_LIB(mythes-1.2, main, [MYTHES_LIBS="-lmythes-1.2" lyx_mythes=yes], [lyx_mythes=no]) 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]) @@ -450,39 +590,22 @@ 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], [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])], + Possible values: posix, windows, macosx, haiku])], [lyx_use_packaging="$withval"], [ case $host in *-apple-darwin*) lyx_use_packaging=macosx ;; - *-pc-mingw32*) lyx_use_packaging=windows;; - *) lyx_use_packaging=posix;; + *-pc-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 lyx_install_macosx=false lyx_install_cygwin=false lyx_install_windows=false @@ -490,6 +613,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' @@ -511,16 +635,22 @@ case $lyx_use_packaging in pkgdatadir='${datadir}/${PACKAGE}' default_prefix=$ac_default_prefix case ${host} in - *cygwin*) lyx_install_cygwin=true ;; - esac ;; - *) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;; + *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) -AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin) AM_CONDITIONAL(INSTALL_WINDOWS, $lyx_install_windows) -dnl Next two lines are only for autoconf <= 2.59 -datadir='${datarootdir}' -AC_SUBST(datarootdir) +AM_CONDITIONAL(INSTALL_CYGWIN, $lyx_install_cygwin) +AM_CONDITIONAL(INSTALL_POSIX, $lyx_install_posix) AC_SUBST(pkgdatadir) AC_SUBST(program_suffix) ]) @@ -635,3 +765,24 @@ AC_DEFUN([LYX_SET_VERSION_INFO], AC_SUBST(LYX_DIR_VER,"$lyx_dir_ver") 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])])