From f792fe8037da9a467bfb44a74e00518916378db4 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 10 Feb 2011 20:31:07 +0000 Subject: [PATCH] fix bug #7288: add configure option for external mythes library git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37585 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/lyxinclude.m4 | 33 ++++++++++++++++++++++++++++++++- configure.ac | 1 + src/Makefile.am | 2 +- src/Thesaurus.cpp | 4 ++++ src/support/Makefile.am | 5 ++++- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index b90d62ac4d..c62960ad88 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -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], @@ -337,6 +337,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=""]) + 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]) + 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 diff --git a/configure.ac b/configure.ac index f83d8f3c6d..864763c9e3 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,7 @@ AC_SUBST(LIBPSAPI) AC_CHECK_LIB(gdi32, main) LYX_USE_INCLUDED_BOOST +LYX_USE_INCLUDED_MYTHES # Needed for our char_type AC_CHECK_SIZEOF(wchar_t) diff --git a/src/Makefile.am b/src/Makefile.am index 323f377298..02b9b29bb4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ SUBDIRS = support frontends . $(CLIENT) tex2lyx EXTRA_DIST = pch.h -OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) $(AIKSAURUS_LIBS) \ +OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \ $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI) noinst_LIBRARIES = liblyxcore.a diff --git a/src/Thesaurus.cpp b/src/Thesaurus.cpp index bf657762c1..5600e53380 100644 --- a/src/Thesaurus.cpp +++ b/src/Thesaurus.cpp @@ -23,7 +23,11 @@ #include "support/lstrings.h" #include "support/os.h" +#ifdef USE_EXTERNAL_MYTHES +#include MYTHES_H_LOCATION +#else #include "support/mythes/mythes.hxx" +#endif #include "frontends/alert.h" diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 9a8fccf61c..453ef26bdf 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -102,10 +102,13 @@ liblyxsupport_a_SOURCES = \ userinfo.h \ unicode.cpp \ unicode.h \ - weighted_btree.h \ + weighted_btree.h +if USE_INCLUDED_MYTHES +liblyxsupport_a_SOURCES += \ mythes/mythes.cxx \ mythes/mythes.hxx \ mythes/license.readme +endif #if INSTALL_MACOSX #liblyxsupport_a_SOURCES += \