Cmake build: Adapt handling of mytheslib to automek behaviour

[lyx.git] / 3rdparty / Makefile.am

diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 40eb64367acac329eab262751b45cdcd522704ac..c6cc780644983f9f3f2cb1d3ad847e1b45e90257 100644 (file)
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -1,9 +1,28 @@
 include $(top_srcdir)/config/common.am
 
-DIST_SUBDIRS = boost hunspell libiconv zlib
+DIST_SUBDIRS = boost hunspell mythes libiconv zlib
 
 if USE_INCLUDED_BOOST
+if LYX_USE_STD_REGEX
+else
 BOOST = boost
 endif
+endif
+
+if USE_INCLUDED_HUNSPELL
+HUNSPELL = hunspell
+endif
+
+if USE_INCLUDED_MYTHES
+MYTHES = mythes
+endif
+
+if USE_INCLUDED_ICONV
+ICONV = libiconv
+endif
+
+if USE_INCLUDED_ZLIB
+ZLIB = zlib
+endif
 
-SUBDIRS = $(BOOST)
+SUBDIRS = $(BOOST) $(HUNSPELL) $(MYTHES) $(ICONV) $(ZLIB)