X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Flyxinclude.m4;h=9fe42e884747490912f170b7145d670a4feade83;hb=a5a8c6731c27d3c7b1aa8a6384ec701aa7e5e332;hp=585cb7f8f08184bccfbeb05963aab35c286c0bac;hpb=aa6619237d0f1eca7bca8838580628639824f32e;p=lyx.git diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 585cb7f8f0..9fe42e8847 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -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,25 +19,20 @@ 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]), + AS_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;; prof*) build_type=profiling;; gprof*) build_type=gprof;; 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]);; + *) 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))], + [AS_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 @@ -62,14 +63,18 @@ AC_MSG_RESULT([$withval]) ]) -dnl Check whether to configure for Qt5. Default is Qt4. +dnl Check whether to configure for Qt4 or Qt5. Default is Qt5. dnl AC_DEFUN([LYX_CHECK_QT5],[ -AC_MSG_CHECKING([whether Qt5 is requested]) +AC_MSG_CHECKING([whether Qt5 is disabled]) AC_ARG_ENABLE([qt5], - [ --enable-qt5 use Qt5 for building], - USE_QT5=$enableval, USE_QT5=no) -AC_MSG_RESULT([$USE_QT5]) + [AS_HELP_STRING([--disable-qt5],[do not use Qt5 for building])], + USE_QT5=$enableval, USE_QT5=yes) +if test x$USE_QT5 != xno ; then + AC_MSG_RESULT([no]) +else + AC_MSG_RESULT([yes]) +fi AC_SUBST([USE_QT5]) ]) @@ -137,12 +142,11 @@ 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([], [ +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ #ifndef __clang__ this is not clang #endif -], -[lyx_cv_prog_clang=yes ; CLANG=yes], [lyx_cv_prog_clang=no ; CLANG=no])]) +]])],[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], @@ -165,13 +169,13 @@ 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 + for flag in -std=c++14 -std=c++11 "" -std=gnu++14 -std=gnu++11 ; 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([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ template struct check { @@ -194,13 +198,12 @@ AC_DEFUN([LYX_CXX_CXX11_FLAGS], check_type c; check_type&& cr = static_cast(c); - auto d = a;], [], - [lyx_cv_cxx11_flags=$flag; break]) + 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]) + AC_MSG_ERROR([Cannot find suitable C++11 mode for compiler $CXX]) fi AM_CXXFLAGS="$lyx_cv_cxx11_flags $AM_CXXFLAGS" ]) @@ -211,7 +214,7 @@ 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)]), + AS_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 @@ -220,20 +223,19 @@ AC_DEFUN([LYX_CXX_USE_REGEX], 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( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include #include typedef std::regex_iterator 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]) + ]])],[lyx_std_regex=yes],[lyx_std_regex=no]) CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS AC_MSG_RESULT([$lyx_std_regex]) @@ -256,13 +258,12 @@ AC_DEFUN([LYX_CXX_USE_CALL_ONCE], CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" - AC_TRY_LINK( - [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include static std::once_flag flag; - ], [ + ]], [[ std::call_once(flag, [](){ return; }); - ], [lyx_std_call_once=yes], [lyx_std_call_once=no]) + ]])],[lyx_std_call_once=yes],[lyx_std_call_once=no]) CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS AC_MSG_RESULT([$lyx_std_call_once]) @@ -278,12 +279,11 @@ dnl Usage: LYX_LIB_STDCXX: set lyx_cv_lib_stdcxx to yes if the STL library is li AC_DEFUN([LYX_LIB_STDCXX], [AC_CACHE_CHECK([whether STL is libstdc++], [lyx_cv_lib_stdcxx], -[AC_TRY_COMPILE([#include], [ +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include]], [[ #if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__) this is not libstdc++ #endif -], -[lyx_cv_lib_stdcxx=yes], [lyx_cv_lib_stdcxx=no])]) +]])],[lyx_cv_lib_stdcxx=yes],[lyx_cv_lib_stdcxx=no])]) ]) @@ -292,12 +292,11 @@ 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], [ +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#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])]) +]])],[lyx_cv_lib_stdcxx_cxx11_abi=yes],[lyx_cv_lib_stdcxx_cxx11_abi=no])]) ]) @@ -328,8 +327,8 @@ fi ### We might want to get or shut warnings. AC_ARG_ENABLE(warnings, - AC_HELP_STRING([--enable-warnings],[tell the compiler to display more warnings]),, - [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $ac_cv_prog_gxx = yes ; then + AS_HELP_STRING([--enable-warnings],[tell the compiler to display more warnings]),, + [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $GXX = yes ; then enable_warnings=yes; else enable_warnings=no; @@ -340,19 +339,19 @@ fi ### We might want to disable debug AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug],[enable debug information]),, + AS_HELP_STRING([--enable-debug],[enable debug information]),, [AS_CASE([$build_type], [rel*], [enable_debug=no], [enable_debug=yes])] ) AC_ARG_ENABLE(stdlib-debug, - AC_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),, + AS_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),, [AS_CASE([$build_type], [dev*], [enable_stdlib_debug=yes], [enable_stdlib_debug=no])] ) ### set up optimization AC_ARG_ENABLE(optimization, - AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),, + AS_HELP_STRING([--enable-optimization@<:@=ARG@:>@],[enable compiler optimisation]),, enable_optimization=yes;) case $enable_optimization in yes) @@ -366,7 +365,7 @@ case $enable_optimization in esac AC_ARG_ENABLE(assertions, - AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, + AS_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),, [AS_CASE([$build_type], [dev*|pre*], [enable_assertions=yes], [enable_assertions=no])] ) @@ -382,6 +381,10 @@ if test x$GXX = xyes; then if test x$CLANG = xno; then dnl Useful for global version info gxx_version=`${CXX} -dumpversion` + case $gxx_version in + *.*) ;; + *) gxx_version=`${CXX} -dumpfullversion` ;; + esac CXX_VERSION="($gxx_version)" else gxx_version=clang-$clang_version @@ -405,11 +408,13 @@ if test x$GXX = xyes; then 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 + 9.*) AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra -Wno-deprecated-copy";; + *) AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra";; + esac + fi case $gxx_version in - 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]);; + 2.*|3.*|4.@<:@0-6@:>@) AC_MSG_ERROR([gcc >= 4.7 is required]);; esac if test x$enable_stdlib_debug = xyes ; then dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0 @@ -419,6 +424,7 @@ if test x$GXX = xyes; then lyx_flags="$lyx_flags stdlib-debug" AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode]) AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode]) + AC_SUBST(STDLIB_DEBUG, "-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC") ;; esac fi @@ -443,7 +449,7 @@ dnl be used. AC_DEFUN([LYX_USE_INCLUDED_BOOST],[ AC_MSG_CHECKING([whether to use included boost library]) AC_ARG_WITH(included-boost, - [AC_HELP_STRING([--without-included-boost], [do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], + [AS_HELP_STRING([--without-included-boost], [do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], [lyx_cv_with_included_boost=$withval], [lyx_cv_with_included_boost=yes]) AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes) @@ -508,7 +514,7 @@ 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])], + [AS_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) @@ -574,7 +580,7 @@ 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])], + [AS_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) @@ -603,22 +609,29 @@ dnl prevent clash with system zlib that might be dragged in by other 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])]) +[AC_ARG_ENABLE([callstack-printing], + [AS_HELP_STRING([--disable-callstack-printing],[do not print a callstack when crashing])], + lyx_cv_callstack_printing=$enableval, lyx_cv_callstack_printing=yes) + +if test x"$lyx_cv_callstack_printing" = xyes; then + AC_CACHE_CHECK([whether printing callstack is possible], + [lyx_cv_callstack_printing], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #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=no])]) +fi if test x"$lyx_cv_callstack_printing" = xyes; then AC_DEFINE([LYX_CALLSTACK_PRINTING], 1, [Define if callstack can be printed]) + lyx_flags="$lyx_flags callback-printing" + AM_LDFLAGS="${AM_LDFLAGS} -rdynamic" fi ]) @@ -626,34 +639,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], [use the system MyThes lib instead of the one supplied with LyX])], - [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=""]) - 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]) - 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]) - 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) - else - lyx_included_libs="$lyx_included_libs mythes" - fi - + AC_ARG_WITH(included-mythes, + [AS_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 ] + [#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_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]) ]) @@ -662,7 +685,7 @@ dnl [default-yes-value]) dnl Adds a --with-'dir-name' option (described by 'desc') and puts the dnl resulting directory name in 'dir-var-name'. AC_DEFUN([LYX_WITH_DIR],[ - AC_ARG_WITH($1,[AC_HELP_STRING([--with-$1],[specify $2])]) + AC_ARG_WITH($1,[AS_HELP_STRING([--with-$1],[specify $2])]) AC_MSG_CHECKING([for $2]) if test -z "$with_$3"; then AC_CACHE_VAL(lyx_cv_$3, lyx_cv_$3=$4) @@ -670,7 +693,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) @@ -680,7 +704,7 @@ AC_DEFUN([LYX_LOOP_DIR],[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for dir in `eval "echo $1"`; do if test ! "$dir" = NONE; then - test ! -d "$dir" && AC_MSG_ERROR([\"$dir\" is not a directory]) + test ! -d "$dir" && AC_MSG_ERROR(['$dir' is not a directory]) $2 fi done @@ -694,7 +718,7 @@ AC_DEFUN([LYX_ADD_LIB_DIR],[ $1="${$1} -L$2" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then - if test $ac_cv_prog_gxx = yes ; then + if test $GXX = yes ; then $1="${$1} -Wl[,]-R$2" else $1="${$1} -R$2" @@ -744,8 +768,8 @@ 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, haiku])], + [AS_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 ;; @@ -817,13 +841,12 @@ AC_DEFUN([AC_FUNC_MKDIR], [AC_CHECK_FUNCS([mkdir _mkdir]) AC_CACHE_CHECK([whether mkdir takes one argument], [ac_cv_mkdir_takes_one_arg], -[AC_TRY_COMPILE([ +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #if HAVE_UNISTD_H # include #endif -], [mkdir (".");], -[ac_cv_mkdir_takes_one_arg=yes], [ac_cv_mkdir_takes_one_arg=no])]) +]], [[mkdir (".");]])],[ac_cv_mkdir_takes_one_arg=yes],[ac_cv_mkdir_takes_one_arg=no])]) if test x"$ac_cv_mkdir_takes_one_arg" = xyes; then AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, [Define if mkdir takes only one argument.]) @@ -858,7 +881,7 @@ AC_DEFUN([MSYS_AC_CANONICAL_PATH], dnl this is used by the macro blow to general a proper config.h.in entry m4_define([LYX_AH_CHECK_DECL], [AH_TEMPLATE(AS_TR_CPP(HAVE_DECL_$1), - [Define if you have the prototype for function `$1'])]) + [Define if you have the prototype for function `$1'])])dnl` dnl Check things are declared in headers to avoid errors or warnings. dnl Called like LYX_CHECK_DECL(function, header1 header2...) @@ -878,7 +901,7 @@ done]) dnl this is used by the macro below to generate a proper config.h.in entry m4_define([LYX_AH_CHECK_DEF], [AH_TEMPLATE(AS_TR_CPP(HAVE_DEF_$1), - [Define to 1 if `$1' is defined in `$2'])]) + [Define to 1 if `$1' is defined in `$2'])])dnl' dnl Check whether name is defined in header by using it in codesnippet. dnl Called like LYX_CHECK_DEF(name, header, codesnippet) @@ -891,9 +914,7 @@ AC_DEFUN([LYX_CHECK_DEF], 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_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <$2>]], [[$3]])],[lyx_have_def_name=yes],[lyx_have_def_name=no]) AC_LANG_POP(C++) CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS @@ -924,23 +945,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])])