]> git.lyx.org Git - lyx.git/blobdiff - config/lyxinclude.m4
Whitespace only.
[lyx.git] / config / lyxinclude.m4
index b90d62ac4de1c2c717d01edef899ec9ed7b35219..ed12f3d630566c6ee61bba20ff055665530f5f04 100644 (file)
@@ -313,7 +313,7 @@ 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],
@@ -321,8 +321,17 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
        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])
+               AC_LANG_PUSH(C++)
+               SAVED_LDFLAGS=$LDFLAGS
+
+               LDFLAGS="$SAVED_LDFLAGS -lboost_signals -lm"
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_underscore=yes], [])
+               LDFLAGS="$SAVED_LDFLAGS -lboost_signals-mt -lm $LIBTHREAD"
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_underscore_mt=yes], [])
+
+               LDFLAGS=$SAVED_LDFLAGS
+               AC_LANG_POP(C++)
+
                if test x$lyx_boost_underscore_mt = xyes ; then
                        BOOST_MT="-mt"
                else
@@ -337,6 +346,37 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
 ])
 
 
+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
@@ -481,12 +521,15 @@ case $lyx_use_packaging in
           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)
@@ -604,3 +647,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])])