*) AC_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;;
+ *svn*|*dev*) build_type=development;;
*pre*|*alpha*|*beta*|*rc*) build_type=prerelease;;
*) build_type=release ;;
esac])
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])
])
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],
;;
esac
fi
+ if test x$enable_cxx11 = xyes ; then
+ 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)
dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
dnl be used.
AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
- AC_MSG_CHECKING([whether to use boost included library])
+ 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])],
[lyx_cv_with_included_boost=$withval],
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
+ AC_LANG_PUSH(C++)
+ save_LIBS=$LIBS
+
+ LIBS="$save_LIBS -lboost_signals -lm"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_plain=yes], [])
+ LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_mt=yes], [])
+
+ LIBS=$save_LIBS
+ AC_LANG_POP(C++)
+
+ if test x$lyx_boost_mt = xyes ; then
BOOST_MT="-mt"
else
BOOST_MT=""
- if test x$lyx_boost_plain != xyes -a x$lyx_boost_underscore != xyes ; then
+ if test x$lyx_boost_plain != 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_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
+ LYX_ERROR([No suitable MyThes library found (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
+])
+
+
dnl Usage: LYX_WITH_DIR(dir-name,desc,dir-var-name,default-value,
dnl [default-yes-value])
dnl Adds a --with-'dir-name' option (described by 'desc') and puts the
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'
default_prefix=$ac_default_prefix
case ${host} in
*cygwin*) lyx_install_cygwin=true ;;
- esac ;;
+ *apple-darwin*) lyx_install_macosx=true ;;
+ esac
+ lyx_install_posix=true ;;
*) LYX_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)
+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(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])])
projects / lyx.git / blobdiff